Merge branch 'master' into #26-вывод_ошибок_в-_ToolTip
backup
backup
Merge branch '#63-UIGroupProps' into #26-вывод_ошибок_в-_ToolTip

Conflicts:
	src/wap/views/sms/formStockList.js
close #26
backup
Merge branch 'master' into #26-вывод_ошибок_в-_ToolTip

Conflicts:
	src/wap/public/js/wap.js
	src/wap/server/console.d
	src/wap/views/sms/properties/formSimPropertyMaster.js