Remember me fix.

comments in code
Merge branch 'rememberme-fix'

Conflicts:
	Modules/user/user_model.php