email error fix
Merge remote-tracking branch 'origin/0.5' into 0.5
new ui changes
Merge pull request #202 from thomasalrin/0.5

new ui