Temporary push with dingpan work
Fixed conflicts with analytics_specifics.js
Added working test setup & link to setup page
Merge branch 'master' of github.com:csc3942014/group4