Merge pull request #166 from sharoonthomas/develop

Template changes
Integrate will google analytics