cleanup
Merge branch 'master' of github:robertjchristian/angular-enterprise-seed

Conflicts:
	README.md