Google analytics stuff
Merge branch 'master' of github.com:drake1701/Paper-Roll

Conflicts:
	application/views/scripts/entry/view.phtml