1.fixed bugs

Conflicts:
	source/src/com/v2tech/view/contacts/add/AddFriendHistroysHandler.java
1.fixed bug