Google analytics added, changed some buttons
Merge branch 'develop' into staging