Merge pull request #384 from mikeh/master

MOBILE-2905
MOBILE-2910: Fix NSRangeException in - [TaskViewController tableView:cellForRowAtIndexPath:], line 364