Merge remote-tracking branch 'upstream/android' into android
Merge remote-tracking branch 'upstream/android' into android

Conflicts:
	res/values/strings.xml
Merge branch 'animalList' into android

Conflicts:
	res/values/strings.xml
Merge remote-tracking branch 'remotes/upstream/android' into android
Merge remote-tracking branch 'upstream/android' into android
Merge remote-tracking branch 'upstream/android' into android

Conflicts:
	res/values/strings.xml
Merge remote-tracking branch 'upstream/android' into android
add patch from Joanna Cisło ( new function findDistance(Node start, Node end) )
add necessary strings and tags;
add new NestedFragment in SightseeingFragment (closest Animal);
add necessary layouts;
create fragment with list of nearest animals;
create class keeping pair (Animal, distance);
fix crash when last location is unknown
fix crash when coming back to SightseeingFragment
use ArrayAdapter instead of BaseAdapter for NearestAnimalsAdapter
move NearestAnimalsAdapter unto NearestAnimalsListFragment class as private static class
Merge remote-tracking branch 'upstream/android' into android
refactor: method finding closest animal moved to AnimalFinderHelper.java
update closest animal on navigation update (inactive yet)
check if current closest animal is the same as previous
add handler and toast message
Merge remote-tracking branch 'upstream/android' into android

Conflicts:
	res/values/strings.xml
	src/com/blstream/myguide/BundleConstants.java
	src/com/blstream/myguide/SightseeingFragment.java
	src/com/blstream/myguide/StartActivity.java
typo fix
Merge remote-tracking branch 'upstream/android' into android

Conflicts:
	src/com/blstream/myguide/SightseeingFragment.java
Merge remote-tracking branch 'upstream/android' into android

Conflicts:
	res/values/strings.xml
layout fixes
fix nearest animal behavior when gps is turned off and on