Merge branch 'release/beta-0.2.2'
Merge branch 'develop'
Merge branch 'release/beta-0.3'
Modifed the model to support custom User models
Added AUTH_USER_MODEL to the test testings
Merge remote-tracking branch 'origin/develop' into develop