updated base user model to remove depricated FOS user class
Merge branch 'origin/2.2'