Adding embed in media
Merge branch 'master' of github.com:opps/opps-multimedias

Conflicts:
	opps/multimedias/mediaapi.py
	opps/multimedias/models.py