Merge branch 'hotfix/0.2.2'

* hotfix/0.2.2:
  fix layout
  get email address from settings page
  add placeholders to fields
  use MVC access to PW vars
  remove unneeded comment
move google analytics conditional into analytics partial
Merge branch 'hotfix/0.2.3' into develop

* hotfix/0.2.3:
  move google analytics conditional into analytics partial