Bounderies toegevoegd
sidebar toegevoegd
Merge branch 'Thomas' of https://github.com/MikevanLoe/IndoorNav into ThatAss
Bounderies toegevoegd
icon toegevoegd
Merge branch 'Thomas' of https://github.com/MikevanLoe/IndoorNav into Ian

Conflicts:
	MovinIndoor/app/src/main/java/project/movinindoor/MapsActivity.java
Merge
Map WTC doet het
Merge branch 'Ian' of https://github.com/MikevanLoe/IndoorNav into Thomas

Conflicts:
	MovinIndoor/app/src/main/java/project/movinindoor/MapsActivity.java
httpsjson&mergefix