fix AABB touch function
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/raster.js
fix AABB touch function