added option of using email for username display
removed debug
indent fix, and still TODO
Merge branch 'master' into devel
Merge branch 'master' into devel
db capacity fix

inreased the maxiumum lengths of variable names and responses