qwer

wer
Merge branch 'master' into Rafa

Conflicts:

Handy.xcodeproj/project.xcworkspace/xcuserdata/maiquez.xcuserdatad/UserI
nterfaceState.xcuserstate
	Handy/Controllers/Stands/StandsViewController.xib
Añadido vista programacion eventos
Merge branch 'Rafa' of https://github.com/ttanoarg/HandyAppVM into Rafa

Conflicts:

Handy.xcodeproj/project.xcworkspace/xcuserdata/maiquez.xcuserdatad/UserI
nterfaceState.xcuserstate
	Handy/Controllers/Stands/StandsViewController.xib
mergin
mergin
mergin
Merge branch 'Rafa'

Conflicts:

Handy.xcodeproj/project.xcworkspace/xcuserdata/Planetmedia.xcuserdatad/U
serInterfaceState.xcuserstate
	Handy/Controllers/TabBar/TBViewController.m
Merge branch 'master' of https://github.com/ttanoarg/HandyAppVM

Conflicts:

Handy.xcodeproj/project.xcworkspace/xcuserdata/maiquez.xcuserdatad/UserI
nterfaceState.xcuserstate
ref