not sure why these weren't tracked within vs2013
Merge branch 'develop' of https://github.com/shellthor/angular-app1 into develop

Conflicts:
	package.json
	test/spec/controllers/main.js