Añadidas capas de persistencia y consultas
Merge branch 'A-team' into develop
Añadida parte de persistencia restante

Conflicts:
	app/Global.java
	app/controllers/Register.java
	app/models/Business.java
	app/models/Collaborator.java
	app/persistence/impl/UserJdbc.java
	app/views/register.scala.html
	data/data/test.log
	data/data/test.properties
Merge branch 'model_equipo-A' into develop