Merge pull request #895 from codecombat/master

Merge master into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #918 from codecombat/master

Merge master into production
Merge pull request #919 from codecombat/master

Potential popup blocker fix
Merge pull request #920 from codecombat/master

Merge master into production
Merge branch 'master' into production
Merge branch 'master' into production
Set up the LevelLoader to load names instead of whole ThangTypes.
Merge branch 'master' into production
Merge pull request #936 from codecombat/master

Master into production
Merge pull request #937 from codecombat/master

Master into production
Merge branch 'master' into production
Merge pull request #943 from codecombat/master

Master into production
Merge pull request #944 from codecombat/master

Scroll to candidate position while going back
Merge pull request #945 from codecombat/master

Implemented save notes button
Merge branch 'master' into production
Merge branch 'master' into feature/thangload

Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
Merge branch 'master' into feature/thangload

Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee