Merge branch 'master' into web-api
Expose StationDAO.findStationPairsWithDistance to JS
Make getStationDestinations return counts

Now returning a map from end station id to count of trips.
Uses an implementation in StationRepositoryCustom.
Merge branch 'master' of https://github.com/mhotan/DD2471 into web-api
Merge branch 'web-api' of https://github.com/mhotan/DD2471 into web-ui

Conflicts:
	server/src/main/java/se/kth/csc/moderndb/cbexplorer/rest/controller/CitiBikeController.java