new commit
Merge branch 'kuba'

Conflicts:
	bin/classes.dex
	bin/classes/org/agh/wastemanagementapp/MainActivity.class
	bin/resources.ap_
	src/org/agh/wastemanagementapp/MainActivity.java
	src/org/agh/wastemanagementapp/MapActivity.java