Merge pull request #183 from codecombat/master

Merging a few days of progress into the production branch
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #244 from codecombat/master

Merge production into master for deploy
Merge pull request #263 from codecombat/master

Merging into production
Merge pull request #269 from codecombat/master

Merged progress into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Upgrade from Bootstrap 2 to Bootstrap 3
Reworked how sprites flip when rotated.
Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3

Conflicts:
	app/templates/play/level/playback.jade
Update es-ES.coffee
Huge Aether performance fix; spells now scroll while debugging.
Refactored some mail functions and constants to a new common module.
Added a test webhook for MailChimp.
Merge branch 'master' of https://github.com/codecombat/codecombat
Came up with a better hacky logging system.