Nueva funcionalidad
Merge branch 'master' of https://github.com/ialcazar/intelygenz-ejemplo into develop

Conflicts:
	README
Merge branch 'develop'