FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way.
Merge branch 'master' into fixed_modals

Conflicts:
	app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
	app/assets/stylesheets/application/modal.css.scss
Accidently removed some styles in the merge
Updated HEROKU.md squashed

I've added an extra step to explicitly add the production.rb file.

Added S3 CDN instructions with asset sync gem. Users assets will auto sync with S3 on deploy, using Gziped files where available. This should significantly help with Heroku stability under load.

Added add-on instructions for some load testing services available through Heroku. Hopefully help us hack on performance and stability issues.

Some general houskeeping, fixed h1 h2 muddle and removed bundle exec from foreman commands, as it uses bundler by default, and added some commands for running tests.
Fix spacing
Refactor topic_query.rb for better readability

- Available options are defined and validated
- Internal methods are now protected
- Renamed some variables to be more consistent
FIX: CDN doesn't work with S3
Merge pull request #1208 from ZogStriP/fix-cdn-does-not-work-with-s3

FIX: CDN doesn't work with S3
FIX: History modal having custom (old) setting of min height and width.

It is functional, but it no longer resizes down. I would look at making this fluid or having a style for mobile.
changed s3 urls to using the folder convention
renamed s3 to s3_store
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