Fixes #546
Merge branch 'master' of https://github.com/walkingtospace/codecombat
Merge remote-tracking branch 'codecombat/master'
Refactoring ModalView Templates
Merged.