Merge branch 'master' of https://github.com/danielCantwell/AutoText

Conflicts:
	src/edu/usc/danielcantwell/autotext/MainActivity.java
	src/edu/usc/danielcantwell/autotext/SendMessage.java