old cacheReader
Merge branch 'master' of https://github.com/OSMBuildings/Portal

Conflicts:
	server/cache/CacheReader.js
cache proto