adds videos merging on server side
Merge branch 'master' of https://github.com/guillaume-gouchon/html5-jam