test fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ua/kharkov/khpi/gorbenko/course/logic/calculations/Complex.java
	src/main/java/ua/kharkov/khpi/gorbenko/course/web/validation/EditUserValidator.java