Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from codecombat/master

Merge with codeCombat
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from codecombat/master

update
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from codecombat/master

Update
Merge remote-tracking branch 'upstream/master'
Better recoverability for non-UserCodeProblem errors during world generation.
Fixed a couple typos with failed resource loading handling.
Fixed some remaining jqxhr objects hanging around.
Made sure sprites are idle and properly positioned when they load.
Refactored getRenderData from SearchView to children
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from codecombat/master

update
Merge branch 'master' of https://github.com/Darredevil/codecombat
Fixes #1096 by ensuring progress is reset back to zero so render gets called correctly after ajax call to load patches completes
Merge pull request #1101 from dpen2000/FixPatchesList

Fixes #1096
Merge pull request #1098 from rubenvereecken/view-refactoring

Refactored getRenderData from SearchView to children
Fixed models thinking they've got changes when they don't.
Protecting our replacement of Math.random via Aether.