поправил splitter
backup
backup
backup
Merge branch 'master'
Merge branch 'master'
backup
backup
backup
backup
backup
Merge branch 'refs/heads/master' into #58-user-Information

Conflicts:
	WAP.qcd
	src/wap/public/css/controls.css
	src/wap/public/js/controls.js
	src/wap/public/js/modal.js
	src/wap/public/js/wap.js
	src/wap/server/actions.d
	src/wap/server/binders.d
	src/wap/server/controls.d
	src/wap/server/webrender.d
	src/wap/server/widget.d
	src/wap/views/admin/security/formMainSecurity.css
	src/wap/views/admin/security/formMainSecurity.d
	src/wap/views/admin/security/formMainSecurity.js
	src/wap/views/admin/security/formMainSecurity.ui
	src/wap/views/common/EditBox.ui
	src/wap/views/common/QuestionBox.ui
	src/wap/views/tests/control_samples.ui
	src/wap/views/tests/testListView.d
	src/wap/views/tests/testListView.ui
	src/wap/views/tests/testTableView.d
	src/wap/views/tests/testTableView.ui
	src/wap/views/tests/test_splitter.ui
backup
backup
Merge branch 'master' into #58-user-Information

Conflicts:
	WAP.qcd
	src/wap/public/css/controls.css
	src/wap/server/actions.d
	src/wap/server/webrender.d
	src/wap/views/_root/renders.d
	src/wap/views/tests/edit_person.d
	src/wap/views/tests/testTableView.d
backup
backup
backup
backup
Merge branch 'master' into #58-user-Information

Conflicts:
	src/wap/public/js/controls.js
	src/wap/public/js/wap.js