Add pilar; Add obstacle types
Merge branch 'develop' into gh-pages