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
Tweaking CSS
Tweaking allowed types again. See #1114
Fixed lexical error in translation
Merge branch 'upstream/master'
Adding new Base-2014 theme as a submodule
No grouping in backends contentype listing

I think, grouping should be switched off in backends contenttype listing when another sort order is seleceted by clicking in the header line. What do you think?
Merge branch 'upstream/master'
More flexible Setcontent parameters in twig
urlencode() href'd attribute strings...  Nothing to see here ;-)
One too many
Custom listing should use slug instead name as filename
Change a silly Dutch label to english.
Merge pull request #1113 from cdowdy/master

HTML5 form validation additions to SimpleForm
Merge pull request #1116 from SilverClash/master

Fixed lexical error in translation
Merge pull request #1122 from rarila/patch-1

No grouping in backends contentype listing
Merge pull request #1123 from rixbeck/feature-1120

[Feature] Allow Setcontent tag accept expression for some attributes
Merge pull request #1124 from GawainLynch/hotfix/Socialite

urlencode() href'd attribute strings... Nothing to see here ;-)