Fixed merge conflicts for Jasper's commits.
Merge https://github.com/codecombat/codecombat
Simulator fixes!

Fixed memory bug with aggregation framework
Merge pull request #820 from codecombat/master

Master into production
Fixed #715, and some misc cleanup.
Fixed #714 with a hack.
Fixed #681 by removing full-screen button in Safari.
Horribly untested improvement for #555 which I will test momentarily.
Change populate model to accept resource name.
#223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff.
Fixed #555. Fixed #350.
Fixed #419 to not redo node/mongo downloads when rerunning the script.
Smarter fix for #810, since not all 24-character strings are like MongoDB ids.
#353 is fixed as far as I can tell; python3 and python2 both run setup.
Before change dependency without name.
Added data merge conflict handling.
Ameliorated #468, maybe. At least, it doesn't erroneously show the name errors any more.
Added buttons for performing actions on patches.
Merge branch 'master' into feature/jsondiffpatch

Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
Merge branch 'master' into feature/jsondiffpatch

Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade