oops, a load of stuff was copypasted from UserShell, remove that...
rearrange milestone planner and use our priority names
Fix add user test, password was too short