Changed JSON systems response to include :id, :color and :message
Merge branch 'develop' into test-build