Added Google Universal Analytics Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	picasso/templates/main_template.html