Updated 2.5/3.0 with Furthest Possible using Activity

No further work can be done using activities because the database is not
sharable over separate Contexts.   Options are to make MachineActivity
into a fragment or Override the GUI's getContext with a singleton to
unify all the Activities.