new User entity INSTEAD of default Django one (not working yet)
Merge branch 'develop' of https://github.com/joinrpg/joinrpg into develop

Conflicts:
	claims/models.py
	jrlib/models.py