changed login-page
changed edit-page
changed file-structure of front-end part
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	educomplex-web/src/main/webapp/WEB-INF/jsp/articles.jsp
changed login-page