Merge conflict
Merge branch 'master' of https://github.com/maximejimenez/VIACinema

Conflicts:
	VIACinema/VIACinema/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	VIACinema/VIACinema/obj/Debug/VIACinema.csproj.FileListAbsolute.txt