Added showMediaModal
Removed showMediaModal
Fixed merge conflict

Conflicts:
	js/app.js