Need to require app source file for app to work (though it worked before)
Merge branch 'master' into logging