Added todo section
added user support
Merge remote branch 'aferre/master' into adduser
added group support