attempt to use bower and gulp
Merge branch 'dev'