fixed up bower.json for registration
Merge branch 'dev'