fix some bugs
Merge branch 'master' of https://github.com/nromanen/Ch-025

Conflicts:
	SSEL/.gitignore
Merge branch 'master' of https://github.com/nromanen/Ch-025

Conflicts:
	SSEL/src/main/java/com/softserve/entity/Subject.java
	SSEL/src/main/java/com/softserve/entity/User.java