update

splash view terminada
Merge branch 'master' of https://github.com/diegosky1/micondominio

Conflicts:

JSONOS/JSONOS.xcodeproj/project.xcworkspace/xcshareddata/JSONOS.xcchecko
ut
	JSONOS/JSONOS/ViewController.m