Merge pull request #16 from froehr/develop

Develop
- adjusted button alignments
Merge branch 'develop' into map-design

Conflicts:
	app/src/main/res/layout/activity_maps.xml
added database access and narrative Activity
added description view to narrative Activity
Basic database access
Convert requested jsons to java-objects and handle them to mapsActivity
bug-fixing on json-representation of request-results (still error with "tags" request)
Adjusted to DB changes
Merge remote-tracking branch 'origin/map-design' into feature/DatabaseAccess

Conflicts:
	app/src/main/java/de/ifgi/igiapp/igi_app/MapsActivity.java
Resolving merge conflicts + bug fixing. There is still an issue with the tag_id attribute of  story-elements and another one with requesting POIs
Fixed issue with tag_id in story-elements
Connected POIs to GoogleMap. Done so far.
Merge remote-tracking branch 'origin/feature/DatabaseAccess' into develop

Conflicts:
	app/app.iml
	app/src/main/java/de/ifgi/igiapp/igi_app/MapsActivity.java
Merge conflicts resolved