fix visiblity of action bar. Add item to style
Delete not use options menu in SightseeingActivity
a Please enter the commit messade for your changes. Lines starting
fix problem with action bar
fix problem with action bar
Merge remote-tracking branch 'upstream/android' into android

Conflicts:
	res/layout/action_bar_sightseeing.xml
	res/layout/activity_sightseeing.xml
	res/layout/sliding_menu_item.xml
	res/values-de/strings.xml
	res/values-pl/strings.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/blstream/myguide/SightseeingActivity.java
add in dependencies "androidTestCompile"
Added markers with animals' names to map. Added new option to config.xml (markers visibility).
Moved code from SighseeingActivity#onCreate to separate methods.
Merge branch 'maps' of https://github.com/illa/MyGuide into android
Create method clearSearchView in SightSeeingActivity, refactor code
Added methods Settings#getValueAsDouble and Settings#getValueAsBoolean. Removed DEFAULT_ANIMALS_VISIBLE field from SightseeingActivity.
Merge pull request #42 from illa/maps

MYGUIDE-133
Merge branch 'android' of https://github.com/blstream/MyGuide into android
Merge branch 'android' of https://github.com/SwiatekSb/MyGuide into android

Conflicts:
	AndroidManifest.xml
Merge remote-tracking branch 'upstream/android' into upstream

Conflicts:
	src/com/blstream/myguide/SightseeingActivity.java
	src/com/blstream/myguide/settings/Settings.java