- added his_her to user
Merge branch 'master' of github.com:PlaySwell/swell_media