Test
Merge branch 'TestNew'

Conflicts:
	src/main/webapp/WEB-INF/jsp/login.jsp
Master