edit users
Merge branch 'master' into dev
Missing Templates, almost ready to go.
Merge pull request #7 from katerman/dev

Dev