Anadido favicon al menu de index
Merge branch 'master' of https://github.com/Arquisoft/Entrecine2

Conflicts:
	database.h2.db
	database.lock.db