Conflicts: IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/MapFragment.java IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/NavigationActivity.java Change-Id: If4178355445843f8bf082747942e3be547e3bfa8 Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>