Merge branch 'master', remote-tracking branch 'origin/edit_contacts' into khalil
MODIFIED: Moved some hardcoded strings to strings.xml
Intending to add a delete number option
Intending to add a delete number option
Merge branch 'khalil' of github.com:tinfoilhat/tinfoil-sms into khalil
Merge branch 'khalil' of github.com:tinfoilhat/tinfoil-sms into khalil
Merge branch 'khalil' of github.com:tinfoilhat/tinfoil-sms into khalil
Merge branch 'edit_contacts' of github.com:tinfoilhat/tinfoil-sms into khalil

Conflicts:
	branches/prephase3/src/com/tinfoil/sms/settings/AddContact.java
	branches/prephase3/src/com/tinfoil/sms/settings/EditNumber.java
Merge branch 'khalil' of github.com:tinfoilhat/tinfoil-sms into edit_contacts

Conflicts:
	branches/prephase3/src/com/tinfoil/sms/settings/EditNumber.java