Allow formatting of slug fields
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add ||| filter to query part so we can use multiple columns in OR part
Revert "Allow formatting of slug fields"

This reverts commit 0025b7cbd0b63888e055ed85d5117a48302be150.
Merge remote-tracking branch 'upstream/master'
add files upload form
Merge pull request #608 from leonbobster/files_upload

add files upload form
Don't throw an error for notices after the contenttype has been removed.
Updating for Symfony 2.3.5
Merge branch 'master' of github.com:bolt/bolt
Rework OR part building as suggested in pull request 600, issue 593
Some modifications to "file upload" in files screen. Ref #608

Some changes to the file upload addition by @leonbobster.

- Notifications for succes / failure
- Whitespace fixes
- Proper redirect, back to the current page
- Location of form on the bottom of the page, better formatted.
- Only show the file-upload form, if the folder is writable to the
webuser.
Merge pull request #600 from hqmatics/master

Add ||| filter to query part so we can use multiple columns in OR part
Working on new Stack functionality.
Working on Stack.
Getting more work done on Stack functionality. Going to be pretty neat, if I say so myself.
Added Stack functionality to File fields.
Tweakin' the Stack.
Oops.