added GUI for adminitrators and users
resolved conflicts
bug fixed save administrator
Creates demo users with userprofiles
Set reset_password to false in demo users creation
renamed templates with - instead of _
Fixes user edit/creation
Adds user list in super-admin dashboard
Fixes mixins
Merge remote-tracking branch 'origin/master' into dev2