Resolve merge conflict
Merge branch 'master' of https://github.com/InvictusInnovations/keyhotee

Conflicts:
	AddressBook/AddressBookModel.cpp