Merge branch 'fix-activity-page-links' into everything
Fixed links on activity page:
Fixed links on activity page
Changed "syntax" to "formatting" in markup help section
Changed alignment of popup
Markup help now displayed as a popup
Fixed selected link CSS
Merge branch 'old-go-behaviour' into everything
Reverted back to to old "go" page behaviour
A previous commit (9698018e) broke redirect functionality; this fixes it.
Fixed upload form (which looked ugly in my theme)
Merge branch 'fixed-upload-form' into everything
Merge branch 'no-smart-reader' into everything
Fixed div.caption css
Added user list page at _users
Merge branch 'plus-in-page-names' into everything
Fixed image export for DOCX, RTF, slides, etc.
Merge pull request #422 from wcaleb/multi_category_url
allow multiple categories in a "_category" url
Version bump to 0.10.4.