commit wip
Merge branch 'master' of https://github.com/shycherry/v15tools

Conflicts:
	js/v15tools-controler.js