fix upload and navigation buttons
update to media browser
Merge branch 'master' into 2.5