Grunt Remove Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/directives/photo-gallery-edit.html
Grunt Remove Controller