some change
Merge remote-tracking branch 'origin/master'

Conflicts:
	doudow/protected/pythonfiles/userPackage/User.py
Merge remote-tracking branch 'origin/master'
login process