21:20 12.06.2014
21:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:2221:22
Merge branch 'master' of https://github.com/kuzovkov/symfony1

Conflicts:
	src/Cinema/CinemaBundle/Resources/views/Default/film.html.twig
	web/bundles/cinemacinema/css/style.css
fix caching? up cuting