optimize the interface
merge css modification
Merge branch 'master' into period1

Conflicts:
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/css/index.css
	src/main/webapp/register.jsp
class 2