Merged Dylan & Rob

Many changes—bug fixed (long clip on event in calendar blocking view
change—and Dylan’s db code. Dylan’s Android only control break on case
details fixed