FIXED: misnamed extra for intent
Merge branch 'master' of github.com:tinfoilhat/tinfoil-sms into khalil

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