Always create type_obj in save method as this caused some unit tests to break for some reason
Merge branch 'xprofile-types' into xprofile-backbone