Edited bower.json
Merge branch 'master' of github.com:jvorcak/jv-angular-logging

Conflicts:
	bower.json