make the "add user" placeholder in composer wider, so other languages can fit into that
fixes bug when modifying the category of a topic but cancelling the edit
Basic Heroku integration
keeping French l10n up to date
update cs translation
extracted a few missing strings
Apache2 Configuration Sample

Sample Virtualhost showing how to:proxy requests to thinserver cluster,
Server static files locally, set headers for downstream server to cache
static assets, exclude mod_security rules that interfere with Discourse.
implement color picking from predefined set for category badges + option to change foreground color
Merge pull request #460 from ZogStriP/extracted-a-few-missing-strings

extracted a few missing strings
Merge pull request #457 from kubabrecka/update_cs14

update cs translation
Merge pull request #459 from tangramor/master

Fixed issue #435. Add zh_TW translations. Add missed translations according to newest en.yml
Merge pull request #455 from ZogStriP/master

keeping French localization up to date
Merge pull request #461 from richp10/master

Sample Apache2 configuration
- Mobile Reply-as-new fix
- Documentation
Keep a jQuery object of hidden login form
Merge pull request #423 from nverba/heroku-integration

Basic Heroku integration
Merge pull request #449 from kubabrecka/composer_wider_placeholder

make the "add user" placeholder in composer wider, so other languages can fit into that
Merge pull request #450 from ZogStriP/fixes-category-bug-on-cancel

fixes bug when modifying the category of a topic but cancelling the edit
Let's ignore `structure.sql` - it doesn't seem necessary and just causes merge
conflicts.
FIX: On refresh, wouldn't say "You liked this"