Refactored controllers to induce only needed injections and to inherit controllers.
Merge branch 'fs/angular-controllers' into taller

Conflicts:
	applications/default/public/js/controllers.js