Changed login-page
Merge remote-tracking branch 'origin/master'

Conflicts:
	educomplex-web/src/main/webapp/WEB-INF/jsp/login.jsp
changed login-page
Merge remote-tracking branch 'origin/master'
changed login-page