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

Conflicts:
	VIACinema/VIACinema.v12.suo
Merge branch 'master' of https://github.com/maximejimenez/VIACinema

Conflicts:
	VIACinema/VIACinema.v12.suo
	VIACinema/VIACinema/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache