Updated templates to work with new box format
Merge branch 'develop' of github.com:cowobo/CoWoBo into develop