Merge pull request #628 from codecombat/master

Quick queue fix
Merge pull request #633 from codecombat/master

Master into production
Merge pull request #635 from codecombat/master

Master into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Fixed issue with two scroll bars appearing.
Additional fixes for double scrollbars of modals.
Merge branch 'master' into production
Merge branch 'master' into production
Longer modals are now scrollable.
Merge branch 'master' into production
merged
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production