Merge branch 'master' of https://github.com/DennyScott/compound

Conflicts:
	client/views/whiteboard/compound.html
Merge branch 'master' of https://github.com/DennyScott/compound