Add normalMap, specularMap and lighting
fix merge conlict
fix merge conlflict
Merge branch 'master' of https://github.com/kinetecharts/dataGlobe