Merge branch 'master'

Conflicts:
	WAP.qcd
	src/wap/models/mainmenu.d
	src/wap/models/persons.d
	src/wap/public/css/controls.css
	src/wap/public/css/controls_condition.css
	src/wap/public/js/actions.js
	src/wap/public/js/controls.js
	src/wap/public/js/debug.js
	src/wap/public/js/engine.js
	src/wap/server/console.d
	src/wap/ui/webrender.d
	src/wap/views/_root/layout.ui
	src/wap/views/_root/renders.d
	src/wap/views/tests/renders.d
	src/wap/views/tests/test.ui
	src/wap/views/tests/test2.ui
	src/wap/views/tests/test4.ui
	src/wap/views/tests/testFL.ui
	src/wap/views/tests/testTreeView.d
	src/wap/views/tests/testTreeView.ui