.
Merge branch 'origin/#62-SimStockMaster'
.
.
Merge branch '#63-UIGroupProps'

Conflicts:
	src/wap/public/js/controls.js
	src/wap/server/webrender.d
	src/wap/views/sms/formStockList.d