Merge branch 'master' into database
Merge branch 'database' of github.com:Watson-Reboot-Project/FullVersion into database
Fixed the Google Analytics issue
Merge branch 'database'