changed user.py to auth.py
Merge branch 'master' of https://github.com/webnotes/treemapper

Conflicts:
	treemapper/database.py