changed dev-version to 3.5.4
handling uppercase extensions with browse, fixed #200
convert/normalize filename (including tests), fixed #205
placeholder with tests, fixed #201
updated translations
final updates for 3.5.4
changed development version to 3.5.5
Fixed file selection after using search box (CKEditor).

Added CKEditor params to the search form hidden inputs so they persist
after searching.
Merge pull request #212 from timgraham/ckeditor_search_params

Fixed file selection after using search box (CKEditor).
updated tests to work on Linux, fixed #213
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	filebrowser/templates/filebrowser/index.html
	setup.py
Fix collapse function at upload form.

The `collapse close` value was present in the HTML, but the Django admin
jQuery scripts were not loaded properly, hence the help box was always
visible.
Make sure popup windows hide the header/footer.

The filebrowser did pass the 'pop' parameter,
but didn't pass that to the Django-admin templates.
Renamed function "addEvent" as it overrides django admin core.js addEvent, and does not work properly in IE9
Removed encoding of file URIs with CKEditor, fixed #210.

File URIs are already encoded in the template by
django.core.files.storage.FileSystemStorage.url(). Escaping
the URI in JavaScript resulted in double encoding of special
characters.
Merge pull request #215 from timgraham/ckeditor_encoding

Removed encoding of file URIs with CKEditor, fixed #210.
Merge pull request #214 from timgraham/fixed_tests

updated tests to work on Linux, fixed #213
update test image
Improved tests with convert/normalize (removed special chars from test filename), #213 #209
Delete TEST IMAGE ÄÄÄ.jpg