Fixes #347: updated google anaytics code implementation
Updated theme templates with GA code