bower.json: moved angular to "dependencies"
Merge remote-tracking branch 'origin/master'