Merge branch 'release/0.3.5' into develop
Fix problem with email verification
Bump to 0.3.6
Merge branch 'release/0.3.6'