Migrate from .on, .once to .listenTo, .listenToOnce
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master

Conflicts:
	app/models/SuperModel.coffee
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master

Conflicts:
	app/models/SuperModel.coffee