Refactored UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	educomplex-web/src/main/webapp/WEB-INF/jsp/articles/view.jsp
	educomplex-web/src/main/webapp/resources/application/css/articles/view.css