add vidoe-js
fixing merge issue
fixed merge
fixed issue with neo4j cypher
added video js
added mediaelement