register
register
Merge origin/master

Conflicts:
	web/JavaScript/validate_register.js