Work on #55 Map entry as parameter.
Closed #55 GStrings in map entries.
Merge branch 'feature/mapParameters' into develop