Merge branch 'master' into gh-pages
bower reg
Merge branch 'gh-pages'