make sure we handle both s3 url formats
Merge pull request #1209 from ZogStriP/fix-s3-image-uploads-are-being-improperly-pathed

Fix s3 image uploads are being improperly pathed
fix composer toolbar upload title
Merge pull request #1210 from ZogStriP/fix-composer-toolbar-upload-title

fix composer toolbar upload title
see: https://github.com/emberjs/ember.js/pull/2148
add some missing Simplified Chinese translation
fix links to site contents, fix it so the site contents page is refreshable
fix unit tests
work in progress category UI
refactor hack from earlier
improve security UI
Merge pull request #1199 from ZogStriP/uploads

adds the `max_attachment_size_kb` setting
db consistency check for mismatching topic_ids in user_actions
fix up post mover so it remaps user actions as well
move specs for post mover into post_mover_spec
Copy over images from latest gemoji

And update list of emojis
Korean language pack
FIX: Invalid YAML
Merge pull request #1211 from zsj950618/master

Add some  translation of Simplified Chinese
Merge pull request #1207 from stephankaag/refactor_topic_query

Refactor topic_query.rb for better readability
Merge pull request #1205 from nverba/patch-2

Updated HEROKU.md squashed
Merge pull request #1198 from prem-prakash/master

Adding Portuguese Brazilian translations
Merge pull request #1206 from BrentleyJones/fixed_modals

FIX: Modal dialogs now truly center and work at all screen sizes (mobile), now with working Bootbox