Adding Portuguese-Brazil language
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: 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.
add some missing Simplified Chinese translation
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
Merge pull request #1213 from novemberkilo/emoji_update

Update emojis from latest gemoji
FIX: Only show undelete button when the topic is deleted
JSHINT