Reorganized task templates. Fixes closing tags issues.
Merge pull request #214 from hotosm/task_tab_layout_

Reorganized task templates. Fixes closing tags issues.