detail controller
Merge branch 'master' of https://github.com/jplarar/PrototipoSPM

Conflicts:
	RELEASE 2/RELEASE
2.xcodeproj/project.xcworkspace/xcuserdata/alumno.xcuserdatad/UserInterf
aceState.xcuserstate
	RELEASE 2/RELEASE 2/Base.lproj/Main.storyboard
	RELEASE 2/RELEASE 2/DetailViewController.h
	RELEASE 2/RELEASE 2/DetailViewController.m
	RELEASE 2/RELEASE 2/MachineViewController.m
	RELEASE 2/RELEASE 2/MasterViewController.m