Finished user types
Merge branch 'feature/membership_type_46419685' into develop