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

Conflicts:
	.idea/libraries/Generated_files.xml
Grunt Remove Controller