no message
removed previous changes. Collections of models and views by default is messy.
Merge branch 'master' into develop

Conflicts:
	app/lib/component.coffee
	app/lib/controllers.coffee