changed to use joda time
fixed merge
fixed merge
adding the timeslot code to save
Merge branch 'master' of https://github.com/objectpartners/petulant-adventure