email tmplates
conflicts
conflicts
don't rehash password
save user position after relogin
checkbox like iphone
checkbox like iphone
Merge pull request #44 from DrBAXA/develop

Develop