fixes in cartodb persistence
Merge branch 'master' into PersistenceInterface

Conflicts:
	cahue-war/pom.xml
	cahue-war/src/main/java/com/cahue/persistence/CartoDBPersistence.java
	cahue-war/src/main/java/com/cahue/resources/SpotsResource.java
Fix in MySQL queries