Merge branch 'master' of github.com:tinfoilhat/tinfoil-sms into edit_contacts
Merge branch 'edit_contacts' of github.com:tinfoilhat/tinfoil-sms into edit_contacts
ADDED: addContact functionality again

Still broken and working on fix but for now it will still be accessible.
ADDED: documentation
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