Merge branch 'release/0.1.0' into develop
hotfix
release
Merge branch 'release/0.1.1'
update
Merge branch 'master' of https://github.com/hirsch88/angularjs-boilerplate into develop

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