renamed col => colspan
updated symfony cache client
Merge pull request #118 from sulu-cmf/bugfix/http-cache

[BUGFIX] updated symfony cache client
fixed bug with colspan
Merge branch 'feature/form-grid' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into develop
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/shorter-prefixes

Conflicts:
	src/Sulu/Component/Content/Template/TemplateReader.php