XG Proyect 2.10.5
Merging XG Proyect 2.10.5
Merge branch 'develop' into feature/html5