commit15
Merge branch 'master' of https://github.com/yoyoyohamapi/RenaissanceVideo

Conflicts:
	src/Video/WebBundle/Resources/views/Play/index.html.twig
fixed
fileupload
text'
Json Enhancemanted