Medienbrowser Update
Merge branch 'master' into pdf

Conflicts:
	app/controllers/mediabrowser_controller.rb
	app/helpers/editing_helper.rb