Implemented marker colouring. Fixed colour panel. Implemented categories to side panel
Merge branch 'master' of https://github.com/scwe/NWEN304Project