added new macros to fieldMacro.ftl (connected with text output)
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/webapp/resources/messages_en.properties