sql1
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	sql/photodb_schema.sql
SQL cambiado