[DEV] Begin to add color
[DEV] Shift control O
Merge remote-tracking branch 'origin/dev-new_new_ui-branch' into thomasBranch

Conflicts:
	src/com/spaceagencies/client/graphics/ether/activities/CardView.java