Add patch to media module.
Merge branch 'develop' of github.com:OS2web/os2web_settings into develop
Added new custom hook with help text. Eg. used from os2web_help to show help text on same help page.
Remove workbench_media dependency. Rewrite from features.
Menus updated.
Use media 7.x-2.unstable7.

Media 1.3 wasnt compatible with file_entity 2.x.
Merge branch 'develop'

Conflicts:
	os2web_settings.features.user_permission.inc
	os2web_settings.info