MArco
Merge branch 'Fraccaroli_Gianmarco' of https://github.com/Fraccaman/BLACKMANBAS into Fraccaroli_Gianmarco

Conflicts:
	Final program/MambaVideo/BlackMamba_Database_Tvseries.xml