added complete icon for uploads, #164
Merge branch 'stable/3.5.x'
unify json response with _upload_file (no matter if file already exists or not), #225
show resulting filename (e.g. with suffix, converted) after successful upload, fixed #225
fix with cycle tag for django 1.7
docs update for 3.5.7
translations update
docs updates
updated dev-version to 3.5.8
wrong grappelli versions with setup.py, #240
removed cycle template tag, fixed #241
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	README.rst
	filebrowser/static/filebrowser/css/filebrowser.css
	filebrowser/templates/filebrowser/include/filelisting.html
	setup.py
cycle tag for django 1.7
docs update