Desacomplamento e mudana dos tamplates
Without expressive feature
Merge Master <-> release_1