comitting most recent work and also pulling in some files from develop so we have the most recent develop user management stuff on this branch