nested entities
Merge branch 'master' of https://github.com/pasqLisena/MediaFragPlayerDemo
nested entities
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/partials/sub_partial.ejs