Changed the way data is retrieved from the data service
Merge branch 'Development-WebGL' of https://github.com/TNOCS/csWeb into Development-WebGL