Add DisplayState reference to UserProfile
Fix conflict
Fix conflict 2
Merge branch 'master' of github.com:stnatic/tcs-organizer