Added names to Users and Admins
Merge branch 'master' of github.com:klaseskilson/vattentornet