Añadida CSalon, VSalon y salon.xml
Merge branch 'master' of https://github.com/Jonazan2/Oasis.git

Conflicts:
	bin/Oasis.apk
	bin/classes.dex
	bin/resources.ap_