indentation
routing enzo
duplicated controllers
start edit
Merge branch 'master' into p-branch

Conflicts:
	app/js/services.js