Change menu name reference.
Add patch to media module.
Remove old conflicts.
Added new custom hook with help text. Eg. used from os2web_help to show help text on same help page.
Change to https urls instead of git.
Remove workbench_media dependency. Rewrite from features.
Wrong menu for links.
Wrong menu for links.
Menus updated.
Use media 7.x-2.unstable7.

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

Conflicts:
	os2web_base.features.field.inc
	os2web_base.info
	os2web_base.make