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
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
fixed a typo
Merge branch 'ThatAss' of github.com:MikevanLoe/IndoorNav into Mike
small edit
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
fixed a conflict
Navigation drawer gemaakt
merge conflict
graph fixing
merge conflict
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
merging fixed
Merge branch 'ThatAss' of github.com:MikevanLoe/IndoorNav into Mike
search interface