Añadido CHabitacion y VHabitacion
Merge branch 'master' of http://github.com/Jonazan2/Oasis.git

Conflicts:
	bin/Oasis.apk
	bin/classes.dex
	bin/classes/com/vistas/VSplash.class
	bin/resources.ap_
	src/com/vistas/VMenu.java