Merge branch 'master' into #58-user-Information
backup
backup
backup
backup
backup
backup
backup
backup
backup
Merge branch 'master' into #58-user-Information

Conflicts:
	WAP.qcd
	src/wap/public/js/controls.js
	src/wap/server/webrender.d
	src/wap/views/tests/control_samples.js
	src/wap/views/tests/user_information.css
backup
backup
backup
backup
backup
backup
Merge branch 'master' into #58-user-Information

Conflicts:
	src/wap/server/webrender.d
	src/wap/views/tests/edit_person.d
backup
backup