AUI-873 - Change the format for variables in Freemarker and Velocity templates
AUI-873 - Build files
Merge branch 'master' into pull-request-160-AUI-873