Added the menu admin per menu module
Media module clean up
Merge conflict resolved
Merge branch 'develop'