bower json error
Merge branch 'master' of https://github.com/mospired/awdg.org into gh-pages