restyle with new logo
add bower components
Merge branch 'master' of github.com:openplans/planningcamp.org into gh-pages
fix merge conflict