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