Fix bug 19/12/2013
Merge branch 'master' into contacts-integration

Conflicts:
	res/layout/contactrow.xml
	res/values/strings.xml
Merging nyiam's codes successfully