TTS
Merge branch 'master' of github.com:MrManhattan/droid-receiver

Conflicts:
	bin/classes/co/mrmanhattan/manhattanreceiver/MainActivity.class