Merge pull request #17 from bayendor/master

Fix merge conflicts for user / address models