Merge branch 'hotfix/h2_icon_cleanup'
h3 updated xml file with author info
Merge branch 'hotfix/h3_xml_file' into develop