Media object
Merge remote-tracking branch 'origin/master' into media-object

Conflicts:
	modules/core/core.js
Minor media fixes.
Merge pull request #35 from commonsmachinery/media-object

Media object