Design
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/jsp/header.jsp
	WebContent/jsp/import.jsp
	WebContent/jsp/register.jsp
	src/resources/texts.properties