Merge branch 'master' into feature/loading-views

Conflicts:
	.gitignore
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee
Merge branch 'feature/loading-views' of https://github.com/gintau/codecombat into feature/loading-views

Conflicts:
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee