Started work on adding display schedule and set schedule activities.
Merge conflicts fixed.
Updated the location broacast mechanism such that any time we enter or exit a radius around the set location it will properly call ScheduleManager to update the appropriate time.
Fix mergeconflicts with strings.xml