Merge branch 'release/0.1.1' into develop
Update README.md
Update README.md
genrator templates
Merge branch 'release/0.1.2'
Merge branch 'master' of https://github.com/hirsch88/angularjs-boilerplate into develop

Conflicts:
	README.md
	build/bower.json
	build/package.json