Changes to be committed:
	new file:   data/uploads/Felicidad.png
	new file:   data/uploads/Homer_9.jpg
Merge branch 'master' into PereBal
 Changes to be committed:
	modified:   data/DBII_01.sql
Merge branch 'master' into PereBal
Merge branch 'master' of https://github.com/PereBal/BD_II into PereBal
 Changes to be committed:
	modified:   templates/Logged_Functions/processar_publicacio.php
 Changes to be committed:
	new file:   templates/Logged_Functions/processar_edanuncis.php