#64 Mail service spec
#79 Secure the settings page
Merge branch 'master' into svn