Merge pull request #610 from bhariharan/master

Make synchronization per DB
Disallowing removal of accounts from the Settings app