Merge branch 'feature/feature2' into develop
Merge branch 'release/1.0'
Merge pull request #1 from mguilarducci/master

ok