Providing real data from CO2.xml
Merge branch 'master' into work

Conflicts:
	webservice/.idea/workspace.xml
	webservice/server.js