use email uid's instead of numbers
minor UI changes
Merge branch 'master' into ubuntu
ubuntu release 0.5.1