Most basic shapes can be drawn
Changed name of message parse method
Merge remote-tracking branch 'origin/dev_martijn' into dev_j

Conflicts:
	canvashs-client/js/main.js
Fixed merge
Updated documentation and slight refactoring of Server.hs
Minor fix main.js
Refactored main.js
Fixes
Merge remote-tracking branch 'origin/master' into dev_j
Default color set (which does not match the protocol)
Merge remote-tracking branch 'origin/dev_j'