Using a Yeoman style project
Restored it to previous functionality in yeoman
Yeoman and Bower files
Merge branch 'angularyo' into develop

Conflicts:
	index.php
Removing old js file