in fieldMacro.ftl created rtcSubmitDoOrCancel
in courseContent.ftl made rtcSubmitDoOrCancel (buttons with new macro)
Merge remote-tracking branch 'origin/Develop' into Develop