Added bower.json
Merge branch 'bower' into dev