Merge pull request #1 from AwareTI/master

Etapa 2 para etapa 3
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge remote-tracking branch 'origin/master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'production' of https://github.com/AwareTI/Iota into production
Merge remote-tracking branch 'origin/master' into production
Merge remote-tracking branch 'origin/master' into production
Merge remote-tracking branch 'origin/master' into production
Merge branch 'master' into production
Merge branch 'production' of github.com:AwareTI/Iota into production
Merge remote-tracking branch 'origin/master' into production
Merge branch 'master' into production
Merge branch 'production' of github.com:AwareTI/Iota into production
Merge remote-tracking branch 'origin/master' into production