remember me
Merge remote-tracking branch 'origin/master'

Conflicts:
	wwwroot/js/sign.js