Adding bower components to see if this will work properly
Merge branch 'master' into gh-pages