Fixed #935.
Merge branch 'master' of https://github.com/codecombat/codecombat
Fixed bug with scale not updating properly when paused.
Fixed #939.
Simulate properly even if Simulator Supermodel starts fully loaded.
Merge branch 'master' into production