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

Conflicts:
	VIACinema/VIACinema.v12.suo
	VIACinema/VIACinema/App_Data/CinemaDB.mdf
	VIACinema/VIACinema/App_Data/CinemaDB_log.ldf
	VIACinema/VIACinema/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
feizjpgjhirqg
dzeoajfao
Merge branch 'master' of https://github.com/maximejimenez/VIACinema

Conflicts:
	VIACinema/VIACinema.v12.suo
	VIACinema/VIACinema/App_Data/CinemaDB.mdf
	VIACinema/VIACinema/App_Data/CinemaDB_log.ldf
	VIACinema/VIACinema/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache