.
.
.
Merge branch '#3-Binder'

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