added method isBetweenLayers to the obstacles
local changes
Merge branch 'kirill' of https://github.com/rossinelli/CTC into kirill

Conflicts:
	vanilla-walls/main.cpp
minor modifications