jdk1.7
optimize the interface
Merge branch 'master' into sakop_answer

Conflicts:
	src/main/webapp/register.jsp