test commit
Merge branch 'dev' of github.com:itinao/p2p-screen-share into dev

Conflicts:
	client/html/popup.html