?
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