added create film action; modifying Create View
Merge branch 'master' into FilmManagement

Conflicts:
	FilmOverflow.WebUI/Controllers/FilmController.cs
added edit film action
Merge branch 'master' into FilmManagement

Conflicts:
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149.mdf
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149_log.ldf
	FilmOverflow.WebUI/Controllers/FilmController.cs
added Seance controller and view seances list action
Merge branch 'master' into FilmManagement

Conflicts:
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149.mdf
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149_log.ldf
adding seance management
Merge branch 'master' into FilmManagement

Conflicts:
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149.mdf
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149_log.ldf
	FilmOverflow.WebUI/FilmOverflow.WebUI.csproj
Merge branch 'master' into FilmManagement
added Update film, Create seance functionality
Merge branch 'master' into FilmManagement

Conflicts:
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149.mdf
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149_log.ldf
	FilmOverflow.WebUI/FilmOverflow.WebUI.csproj
	FilmOverflow.WebUI/ViewModels/SeanceViewModel.cs
	FilmOverflow.WebUI/Views/Hall/Delete.cshtml
	FilmOverflow.WebUI/Views/Hall/Index.cshtml
	FilmOverflow.WebUI/Views/Shared/_Layout.cshtml
completed film CRUD operations
Merge branch 'master' into FilmManagement

Conflicts:
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149.mdf
	FilmOverflow.WebUI/App_Data/aspnet-FilmOverflow.WebUI-20140814042149_log.ldf
	FilmOverflow.WebUI/Controllers/FilmController.cs
fixing merge consequences