Merge pull request #1 from mousebird/develop

Develop
Implemented cached file lifetime in MaplyRemoteTileSource, fixed typo.
Merge pull request #163 from capncode/master

Implemented cached file lifetime in MaplyRemoteTileSource, fixed typo.
Accidentally merge changes into the main tree.  Reverted.  Also fixed a few recent compile problems.
Accidentally merge changes into the main tree.  Reverted.  Also fixed a few recent compile problems.
Merge branch 'develop' of github.com:mousebird/WhirlyGlobe into develop

Conflicts:
	WhirlyGlobeSrc/WhirlyGlobe-MaplyComponent/include/MaplyRemoteTileSource.h
	WhirlyGlobeSrc/WhirlyGlobe-MaplyComponent/src/MaplyRemoteTileSource.mm
Merge branch 'develop' of github.com:johankool/WhirlyGlobe into develop
Undo unintended changes
Header location fix
Merge pull request #173 from johankool/develop

Header location fix