Implement officers on Android

commit fead48703093297b28c11be72cb22c18d37e722a
Author: Rob Tsuk <rob@tsuk.com>
Date:   Thu Sep 18 07:57:36 2014 -0700

    Officers on Android

    Finish data model support for Officers on Android.

commit fb3261d60e023ca2eedbfe4f6c897b94de51ca43
Merge: 0b815dc 4bd7566
Author: Rob Tsuk <rob@tsuk.com>
Date:   Thu Sep 18 07:50:00 2014 -0700

    Merge branch 'master' into android-officers

commit 0b815dc15a761953a836063066f10d47bbe8f27a
Merge: f46cc73 f5b713b
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Sep 12 09:11:08 2014 -0700

    Merge branch 'master' into android-officers

commit f46cc7303ef41886cc803711d57dcc9db78b3ec8
Author: Rob Tsuk <rob@tsuk.com>
Date:   Thu Sep 11 17:58:31 2014 -0700

    Implement officers on Android