backup
backup
Merge branch 'master' into #26-error-Layout-Engine

Conflicts:
	WAP.qcd
	src/wap/public/css/controls.css
	src/wap/public/js/wap.js
	src/wap/server/console.d
	src/wap/server/webrender.d
	src/wap/views/_root/renders.d
	src/wap/views/tests/control_samples.d
	src/wap/views/tests/control_samples.ui
	src/wap/views/tests/testTableView.d
close #26