layout changes
Merge branch 'Release3' of https://github.com/jplarar/PrototipoSPM into Release3

Conflicts:
	RELEASE 2/RELEASE 2/Base.lproj/Main.storyboard