pagina fade in
Merge remote-tracking branch 'origin/master'

Conflicts:
	Website/APc/log.log
	Website/db.sqlite3
pagina fade in