mongoDB
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev

Conflicts:
	views/welcome.ejs