Adding support for bower
Merging master