Upgrade version : match version with "like 1.2.%"
several fixes in templates