Add gps functionality
Add class for logging/displaying coordinates (for tests purpose)
Add dialog about problems with Google Play Services
change time counting in LocationLogger
fix strings.xml
change log level
merge with repo
fix LocationLogger
Application now displays user's location on map in SightseeingActivity.

Added permission for mocking user's location to manifest.
Displaying user's position can be turned off from options XML.
Merge remote-tracking branch 'upstream/android' into mylocation

Conflicts:
	res/raw/config.xml
	src/com/blstream/myguide/settings/Settings.java
Merge remote-tracking branch 'upstream/android' into mylocation

Conflicts:
	AndroidManifest.xml
Updated according to comments.
Refactor gps classes to be used with settings
Make LoactionLogger customizable
Prevent app from lunch without Google Play services
Fix LoactionUpdater not to crash on location services disconection
Merge remote-tracking branch 'upstream/android' into mylocation

Conflicts:
	res/raw/config.xml
	src/com/blstream/myguide/SightseeingActivity.java
	src/com/blstream/myguide/settings/Settings.java
restore proper gradles files
change log tags
attempt to fix CameraUpdateFactory NPE
Merge pull request #36 from hammer814/android

[MYGUIDE-130] Add gps functionality
Merge remote-tracking branch 'upstream/android' into mylocation

Conflicts:
	res/raw/config.xml
	src/com/blstream/myguide/SightseeingActivity.java
	src/com/blstream/myguide/settings/Settings.java
Merge pull request #41 from robin92/mylocation

[MYGUIDE-134] Display user position on map in SightseeingActivity