Merge pull request #85 from ehuelsmann/master

Rename duplicately named function batch__lock(int).
Merge pull request #86 from ehuelsmann/master

Fix #1154: ECA's locations table doesn't show country.
Fix queries needing redefinition due to the elimination of person vs company entities.
Remove debugging code and convert preference screen to newcode (except for _user reference).
Merge pull request #89 from ehuelsmann/fix-user-queries

Convert preference screen to newcode
Merge pull request #90 from ehuelsmann/ticket-1144

Fix #1144: Contact 'Save as new' broken (action not defined).
Fix button title in journal entry (now lists 'value').
Merge pull request #93 from ehuelsmann/fix-edit-save-button-title

Fix button title in journal entry (now lists 'value').
Merge pull request #18 from ledgersmb/master

sync over master branch