play media fragments by clicking entities - timing calc
node modules
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/MFPlayerDemo.js
	node_modules/node-cache/node_modules/underscore/package.json
	node_modules/node-cache/package.json