Merge branch 'master' into development
Revert "Cambio de version a 1.6.0"

This reverts commit a158a84876d9ede6614f7b2535c45edfd8506f82.
Merge branch 'development'