PHP sux: Empty argument never be overriden with "" default parameter, so 'new Cache()' won't initializes with correct BOLT_CACHE_DIR
CRLF replace
Merge branch 'upstream/master'

Conflicts:
	app/src/Bolt/Cache.php
Merge branch 'upstream/master'
Merge branch 'upstream/master'
More flexible Setcontent parameters in twig
Merge pull request #1123 from rixbeck/feature-1120

[Feature] Allow Setcontent tag accept expression for some attributes