User / Expert relationship adjustment
Simplify user/expert relationship
Merge branches 'master' and 'populating'