Added Google Analytics
Merge branches 'staging' and 'master'