fix for media
Merge branch 'master' of https://github.com/Tech-Grind/ng-techgrind

Conflicts:
	app/partials/plugins/content_media.html
Merge branch 'master' of https://github.com/Tech-Grind/ng-techgrind
oklets see if this controller will owrk ok