add equals for PhoneNumberInfo
some small changes
Merge remote-tracking branch 'origin/master' into phoneNumberSettings
add action bar elements for phonenumbers settings
fixed item view of phone numbers
add name attribute to phone number info
broken phone numbers settings activity
fixed build error
fixed multiselect delete
fixed phone number add dialog checks
remove strange toast
fixed multiselect delete
Merge branch 'master' into phoneNumberSettings

Conflicts:
	three-headed-monkey/src/main/res/values/strings.xml
update test
fixed testcase
Merge branch 'master' into phoneNumberSettings

Conflicts:
	three-headed-monkey/src/main/AndroidManifest.xml
Merge branch 'phoneNumberSettings'