Colour coding implemented, and styling fixes
Merge branch 'sprint_two'

Conflicts:
	AmI System (Web)/web/overview.jsp