Merge branch '#13-BioSmart' into #11-Stocks

Conflicts:
	src/sim/sms/stocks.d
Merge branch 'master' into #11-Stocks
WAP#62 fix Ветки удаляются при наличии в них позиций?
fix comparer Resource
Merge branch '#11-Stocks'