default the contact type (no more choose list) and also view photo in big
Merge branch 'master' into contacts-integration

Conflicts:
	res/layout/activity_edit_contact.xml
	res/values/strings.xml
Fixed presentation error misplacement issue