Agile Lab 4 - Added Jodatime for Activity class.

Combined comparators. Fixed fancyString again.