Merge branch 'hotfix/0.0.1.6'
more session / email form fixes
Merge branch 'hotfix/0.0.1.7' into develop