Merged APp.java and included DB fix.
Authored by: James Williams 2014-07-24
Parent(s): [6a810a][8de24e]
Child(ren): [efce10]