Develop

Merging in Bower files for bower support