Moved Google Analytics back into scriptblock.php
Merge branch 'develop' of github.com:Trippnology/Trippnology-2013 into develop