.
fix #21
.
.
Merge branch '#5-Security'

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