Template fun
Added some functionality to the obstacle templates and sub-methods.
Merge remote-tracking branch 'origin/master'