User model fields accessors clashes issue solved
Merge pull request #251 from wumzi/master

User model fields accessors clashes issue solved