hz chto
Class SctokService added. It is working
extra exception deleted
error founded
refactored
Merge branch 'matvei' of github.com:vildhet/octopus into matvei
Merge branch 'matvei'

Conflicts:
	web-octopus/src/main/java/com/octopus/stock/StockService.java

merged