moved admin\courses\content\updateContent.ftl to new macroses
moved admin\news\content\updateNews.ftl to new macroses
Merge remote-tracking branch 'origin/Develop' into Develop