Added Color model
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
Added preview image to checkinform
refactored markers in js
resolved conflicts
Merge branch 'refactorJS' into development
Fixed Exhe.js object
resolved conflicts