correcciones y mejoras belal 4 y 5
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.js
Merge branch 'master' of https://github.com/danyalejandro/hdp

Conflicts:
	src/main.js
Revert "correcciones y mejoras belal 4 y 5"

This reverts commit 7e78765fc7884ac455bb68d8a8418f9dd26243c9.