add crappy video support.
fixing styles
Merge branch 'master' into videoInUserInteraction

Conflicts:
	templates/css/user-style.css
Merge branch 'master' into videoInUserInteraction
Merge branch 'master' into videoInUserInteraction
reload after delete
Merge branch 'master' of https://github.com/madgeeklabs/meveo

Conflicts:
	server.js
Merge branch 'master' of https://github.com/madgeeklabs/meveo