Improvments. Added google analytics
Merge branch 'master' of http://github.com/nighthawk454/tv

Conflicts:
	app/templates/layout.html