simplified controllers for now
Merge branch 'master' of github.com:sugardave/pc-enyo-mvc

Conflicts:
	source/apps/app.js