Update 14/05/13
Merge branch 'master' of https://github.com/Grateds/Proyecto

Conflicts:
	config/schema.sql
	config/schema_test.sql
	target/classes/META-INF/maven/com.unrc.app/inmoweb-app/pom.properties
	target/classes/com/unrc/app/crudUser.class
Merge branch 'master' of https://github.com/Grateds/Proyecto
Deleted Eclipse Files