last changes
analytics
Merge branch 'master' of https://github.com/Ecatombe/CanaryWharf.git

Conflicts:
	project.properties
	res/values/strings.xml