touchObject event fixed
One more touchObject event fix
test entry point name changed
Merge branch 'dev' of https://github.com/KostyaChoporov/FTW into dev

Conflicts:
	s.js
test entry poing fixed again