bringig' bower back
Fixing some bugs.
Merge branch 'master' into dev