Finish addressbook-concept
Merged 'dev'.