pre merge
Merge branch 'master' of https://github.com/vdclouis/dynomite
Merge branch 'master' of https://github.com/vdclouis/dynomite
users & auth
Merge branch 'master' of https://github.com/vdclouis/dynomite