emoticon text field!
Merge branch 'master' of https://github.com/mcwhitak/Textalyzer

Conflicts:
	res/values/strings.xml
	src/com/whitaker/textalyzer/ContactHolder.java