Make register work.
Merge origin/master

Conflicts:
	web/WEB-INF/view/register.jsp
Make register work.
New version of database.
Merge origin/master

Conflicts:
	web/WEB-INF/view/register.jsp