Add patch to media module.
Failed merge fix.
Added new custom hook with help text. Eg. used from os2web_help to show help text on same help page.
Update doc.
Disable @font-your-face
Use media 7.x-2.unstable7.

Media 1.3 wasnt compatible with file_entity 2.x.
Fixed missing theme.

Theme name has changed to os2web_core_theme
Merge branch 'develop'

Conflicts:
	os2web_frontend.features.user_permission.inc
	os2web_frontend.info
	os2web_frontend.make