mousePos74
Merge branch 'dev' of github.com:d3orn/hikomsys into dev
Merge branch 'dev' of github.com:d3orn/hikomsys into dev

Conflicts:
	website/kineticTutorial2.js