About and background color
Merge branch 'asier'

Conflicts:
	src/com/example/aad2project/ui/TaskCalendarFragment.java