added unit tests, cleaned up controller generator, removed module creation in main.js -- needed for testing
removed bower_components, added to gitignore
removed bower components
removed duplicate app dir
Merge branch 'master' of https://github.com/neilff/angular-web-starter-kit

Conflicts:
	app/index.html
	bower.json
Merge branch 'master' into dev
Merge pull request #2 from neilff/dev

Dev