Signed-off-by: Allan Carr <allan.carr@thinkimex.com> # Conflicts: # client/src/utils/TemplateConstants.js