Updated composer.json, allure version to 1.*
Updated Module.php, simplified templatemap merge condition