no message
Merge branch 'master' of https://github.com/tiagoalmeida/WhirlyGlobe

Conflicts:
	WhirlyGlobe.podspec