Merge branch 'Ian' of https://github.com/MikevanLoe/IndoorNav into Thomas

Conflicts:
	MovinIndoor/app/src/main/java/project/movinindoor/MapsActivity.java
httpsjson&mergefix
mergefix
informatie uit database halen kan nu d.m.v json
Menu aangepast
fixing json reading
Json fix
bug fixing graphs
new commit
Merge branch 'Davey' of https://github.com/MikevanLoe/IndoorNav into ThatAss
dijkstra fix
error weggehaald
addMarker + addPolyline
addMarker + addPolyline static fix
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
fixed a conflict