paso 3.1
Merge branch 'master' of https://github.com/Appear-Networks/RS_Teniente

Conflicts:
	RS_Teniente/Base.lproj/Main.storyboard