.
Merge branch 'master' of https://github.com/przedwojow/AndroidAPP.git

Conflicts:
	bin/classes.dex
	bin/classes/pl/zeromskiego/androidapp/MainActivity.class
.
adding sms delivery