prepping for manipedi
Merge branch 'master' into gh-pages
added ga / updated pages