Added database calls to Settings
Merge origin/master