Merge branch '#5-Security'

Conflicts:
	src/wap/public/css/controls.css
	src/wap/public/js/controls.js
	src/wap/public/js/wap.js
	src/wap/server/webrender.d