[ME,MJ]{code before testing} edit name of contact
Merge remote-tracking branch 'origin/client' into client

Conflicts:
	HoiMessenger/res/values/strings.xml
	HoiMessenger/src/at/tugraz/sw/hoi/messenger/AddContactDialog.java