WIP getting template structure to client
Merge branch 'master' of https://github.com/appception/appception

Conflicts:
	client/app/projects/newProject/newProject.controller.js
Merge pull request #171 from kwalker3690/master

(WIP) WIP getting template structure to client
Fix stray comma
Removed extra comma
fixing file paths
Merge branch 'master' of https://github.com/appception/appception
Merge branch 'master' of https://github.com/kwalker3690/appception
Merge pull request #172 from kwalker3690/master

(fix) fixing file paths