fix css, convention mapping edit
merge
Merge branch 'master' into FilmManagement

Conflicts:
	FilmOverflow.WebUI/Controllers/FilmController.cs
added edit film action