Merge branch 'master'

Conflicts:
	WAP.qcd
	src/wap/public/css/controls.css
	src/wap/public/css/wap.css
	src/wap/public/js/actions.js
	src/wap/public/js/wap.js
	src/wap/server/cache.d
	src/wap/server/console.d
	src/wap/server/controls.d
	src/wap/server/model.d
	src/wap/server/webrender.d
	src/wap/views/_root/layout.ui
	src/wap/views/_root/logonInfo.ui
	src/wap/views/_root/mainmenu.d
	src/wap/views/_root/renders.d
	src/wap/views/admin/security/formMainSecurity.d
	src/wap/views/admin/security/formMainSecurity.ui
	src/wap/views/tests/control_samples.d
	src/wap/views/tests/control_samples.ui
	src/wap/views/tests/test2.ui
	src/wap/views/tests/test4.ui
	src/wap/views/tests/testListView.ui
	src/wap/views/tests/testTreeView.ui