TaxiPlannerActivity.java TaxiOrPrivateDialogGetter.class changes
bla
bla
bla bla
bkl
Merge branch 'master' of https://github.com/ilantc/NeedARide

Conflicts:
	bin/dexedLibs/android-support-v4-26e9723dafc4761031ef4c9e0ee18666.jar
added the taxi planner