refactoring + utf-8 filter for cyrillic
+
+
classpath
all
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-ui-test/.classpath
	school-ui-test/.project
	school-ui-test/.settings/org.eclipse.jdt.core.prefs
1.7
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-service/src/main/java/school/service/utils/DateUtil.java