login fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/User.class.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/User.class.php