Fixed DrawForm view helper, matchTemplate() remove labels
Merge branch 'develop' of git://github.com/webino/WebinoDraw into develop