Master with users

branch merging the contents of ozan/user-management