* Analytics scripts enhancement
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/application.js