Merge pull request #2165 from Diapolo/Qt_addrbook_cleanup
Bitcoin-Qt: cleanup / optimise addressbookpage