drawing updated
Merge branch 'master' of https://github.com/TCPIPStack/tollabo

Conflicts:
	src/main/webapp/index.html
drawing and video chat merged