Elizabeth branch (this commit is probably broken)
additional improvements to Task
Merge branch 'elizabeth'
Changed activity_edit_task to use a ScrollView and changed
activity_task_view to not have margins.
Decided to go back to Task (not Task2) and joda time, but changed Task's
start and end setter methods to use the same logic as the ones from
Task2. Also did some cleanup and assorted minor fixes.