Merge pull request #166 from sharoonthomas/develop

Template changes
Integrate will google analytics

* step 3 is reserved for delivery methods, which does not have a
  template yet
Merge pull request #167 from sharoonthomas/google-analytics

Integrate will google analytics
Handle case where templates are displayed