Merge branch 'master'

Conflicts:
	WAP.qcd
	src/wap/public/css/controls.css
	src/wap/public/css/modal.css
	src/wap/public/css/wap.css
	src/wap/public/js/modal.js
	src/wap/public/js/wap.js
	src/wap/server/console.d
	src/wap/server/webrender.d
	src/wap/server/widget.d
	src/wap/views/_root/layout.ui
	src/wap/views/_root/login.html
	src/wap/views/_root/logonInfo.ui
	src/wap/views/_root/renders.d
	src/wap/views/tests/control_samples.css
	src/wap/views/tests/control_samples.ui
	src/wap/views/tests/renders.d
	src/wap/views/tests/test.ui