Google Analytics working now
Analytics should work on heroku now
Merging manually
Merge remote-tracking branch 'upstream/master' into analytics

Conflicts:
	src/server/views/includes/footer.html
Merge pull request #47 from mancabizjak/analytics

Ok.