codecombat/codecombat — pull request #830 by gintau (2014-04-12 23:25:50+00:00)
Title: Merge master to Feature/loading views

As mentioned in #815, this commit merges master with loading-view branch.
After merging these two here I'll create another pull request for style fix and failure handling.