post cagada1
Merge branch 'master' of https://github.com/SeminarioInvestigacion/SeminarioInvestigacion

Conflicts:
	HorizonSuites/HorizonSuites.xcodeproj/project.pbxproj
	HorizonSuites/HorizonSuites/en.lproj/MainStoryboard.storyboard