pre-deployment commit
Merge branch 'master' of https://github.com/mac-adam-chaieb/popcorn

Conflicts:
	tmp/css-default.css
-new design
- updated video sharing (video start playing when we receive, not when we send)