22:40 20.05.2014
11:40 21.05.2014
12:19 21.05.2014
12:30 21.05.2014 Merge branch 'caching'

Conflicts:
	src/Cinema/CinemaBundle/Resources/public/css/style.css