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

Conflicts:
	bin/classes.dex
	bin/classes/co/mrmanhattan/manhattanreceiver/MainActivity.class
	src/co/mrmanhattan/manhattanreceiver/MainActivity.java