?
Merge pull request #5 from froehr/SpeechRecognition

Added interface
Added localization
Merge pull request #6 from TobiTobsen92/develop

Apply changes made in fork to map-design branch
added navigation drawer (prototype)
Merge remote-tracking branch 'origin/develop' into map-design

Conflicts:
	app/src/main/java/de/ifgi/igiapp/igi_app/MapsActivity.java
	app/src/main/res/layout/activity_maps.xml
	app/src/main/res/values/strings.xml
Merge pull request #7 from froehr/map-design

merge map-design/develop
Includes:
- basic map functions
- speech recognition (calling map fucntions)
- prototype of navigation drawer
added custom info windows
updated markers for presentation
Merge pull request #8 from froehr/map-design

Map design
Created new branch for GestureRecognition and implementet basic functionality to access the data from the accelerometer. Note: I implementet this as a activity, but this will have to be changed to a Service later on.
Converted GestureActivity to GestureService
created toggle button to activate/deactivate the GestureService
added missing image files for launcher icon and marker
Merge remote-tracking branch 'origin/SpeechRecognition' into develop

Conflicts:
	app/src/main/java/de/ifgi/igiapp/igi_app/MapsActivity.java
	app/src/main/res/layout/activity_maps.xml
Merge pull request #12 from froehr/develop

Merge Develop
added colors, dimens and fixed API key issue since last merge
Merge remote-tracking branch 'origin/map-design' into feature/MotionGesture

Conflicts:
	app/app.iml
	app/src/main/java/de/ifgi/igiapp/igi_app/MapsActivity.java
	app/src/main/res/layout/activity_maps.xml
Adjust Button for the activation of the MotionGesture Service
Merge pull request #13 from froehr/feature/MotionGesture

added Feature/motion gesture