Merged Michael's back_button_to_the_media_archive

Conflicts:
	app/views/layouts/app_admin.html.haml
	features/step_definitions/i_see_steps.rb