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

Conflicts:
	SSEL/pom.xml
add categoryService tests
Merge branch 'hash'

Conflicts:
	SSEL/pom.xml