Name controller params.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/scripts/controllers/main.js