Issue refs #1323: revert masterpage directives to plain markup
Issue refs #1327: create task form implemented