jscs fix
Merge branch 'pascalbrewing/ng-template' of github.com:DrMabuse23/generator-m into pascalbrewing/ng-template

Conflicts:
	app/index.js