closes #59
Merge branch 'master'

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