Added google analytics
Merge remote-tracking branch 'micro/master'

Conflicts:
	config.js