User.Diane.owl
improve user model error handling
Fixed bad owl file bug in initial enroll
Merge remote-tracking branch 'upstream/develop' into develop