Delete WorkTypeDialog$1.class
Delete WorkTypeDialog$2.class
Delete WorkStopDialog$1.class
Delete WorkStopDialog.class
1
1
Input
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/dexedLibs/android-support-v4-1911576849660653e459537ca11a7964.jar
	TourPilot/bin/resources.ap_