added analytics to develop
working version
merge conflicts
Merge branch 'develop' of https://github.com/EJEHardenberg/green-web into develop