Añadidas todas las clases modo lista
Merge branch 'master' of https://github.com/Jonazan2/Oasis.git

Conflicts:
	gen/com/example/oasis/R.java
	src/com/controladores/CHabitacion.java
	src/com/services/SWatchDog.java