integrated
Merge branch 'master' of https://github.com/Innovitious/whiteboardr

Conflicts:
	js/canvas.js