put some placeholder things back in
added Google Analytics
Merge branch 'develop' into staging
Merge branch 'staging'