aubf
Merge branch 'develop' of github.com:AlbertoGuerreroMartin/CharlaGitProgramaTel-Android into develop

Conflicts:
	CharlaGit/CharlaGit/main.cpp