поправил splitter
closes #59
Merge branch '#59-splitter'
Merge branch 'master'

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