resolve bug(code duplication)
Merge branch 'master' of https://bitbucket.org/Erfive/ancestra-evolutive