1
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/res/crunch/drawable-hdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-hdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-mdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-mdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-xhdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-xhdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_cancel.png
	TourPilot/bin/resources.ap_