Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch

Conflicts:
	app/initialize.coffee
	bower.json