Merge remote-tracking branch 'origin/master'

# Conflicts:
#	bower.json
#	ng-layer.js

Update bower.json

Update bower.json

initial commit

initial commit