10/23
Merge branch 'master' of https://github.com/SeminarioInvestigacion/SeminarioInvestigacion

Conflicts:
	HorizonSuites/HorizonSuites.xcodeproj/project.pbxproj
10/23  2