check version
check version
Merge remote-tracking branch 'gitHub/master'
Merge remote-tracking branch 'gitHub/master'
test
Merge remote-tracking branch 'gitHub/master'

Conflicts:
	src/main/java/com/kpi/risk/rest/RisksService.java
Merge remote-tracking branch 'gitHub/master'
fix bug