added basic collision check
added processing of allow-overlap properties
Merge branch 'develop' into gh-pages