.
Merge branch '#5-Security'

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