switch GoogleAnalytics servlet context
Merge branch 'goc' of github.com:Canadensys/canadensys-explorer into goc

Conflicts:
	src/main/webapp/WEB-INF/dispatcher-servlet.xml