Initial commit
Changes made to view individual datasets
Merge branch 'master' of github.com:cbaillie/SensorBox
Started converting JSPs to use timestamps.
Merge github.com:cbaillie/SensorBox

Conflicts:
	SensorBox/.classpath
	SensorBox/.project
	SensorBox/.settings/.jsdtscope
	SensorBox/.settings/org.eclipse.jdt.core.prefs
	SensorBox/.settings/org.eclipse.wst.common.component
	SensorBox/.settings/org.eclipse.wst.common.project.facet.core.xml
	SensorBox/.settings/org.eclipse.wst.jsdt.ui.superType.container
	SensorBox/.settings/org.eclipse.wst.jsdt.ui.superType.name
	SensorBox/WebContent/CarCommuter.jsp
	SensorBox/WebContent/META-INF/MANIFEST.MF
	SensorBox/WebContent/TrainJourney.jsp
	SensorBox/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
	SensorBox/WebContent/WEB-INF/lib/fuseki-server-0.2.6.jar
	SensorBox/WebContent/WEB-INF/lib/httpclient-4.2.3.jar
	SensorBox/WebContent/WEB-INF/lib/httpcore-4.2.4.jar
	SensorBox/WebContent/WEB-INF/lib/icu4j-3.4.4.jar
	SensorBox/WebContent/WEB-INF/lib/jena-arq-2.10.0.jar
	SensorBox/WebContent/WEB-INF/lib/jena-core-2.10.0.jar
	SensorBox/WebContent/WEB-INF/lib/jena-iri-0.9.5.jar
	SensorBox/WebContent/WEB-INF/lib/log4j-1.2.16.jar
	SensorBox/WebContent/WEB-INF/lib/slf4j-api-1.6.4.jar
	SensorBox/WebContent/WEB-INF/lib/slf4j-log4j12-1.6.4.jar
	SensorBox/WebContent/WEB-INF/lib/xercesImpl-2.10.0.jar
	SensorBox/WebContent/WEB-INF/lib/xml-apis-1.4.01.jar
	SensorBox/WebContent/javascript/jquery.colorhelpers.js
	SensorBox/WebContent/javascript/jquery.flot.crosshair.js
	SensorBox/WebContent/javascript/jquery.flot.fillbetween.js
	SensorBox/WebContent/javascript/jquery.flot.image.js
	SensorBox/WebContent/javascript/jquery.flot.js
	SensorBox/WebContent/javascript/jquery.flot.navigate.js
	SensorBox/WebContent/javascript/jquery.flot.pie.js
	SensorBox/WebContent/javascript/jquery.flot.resize.js
	SensorBox/WebContent/javascript/jquery.flot.selection.js
	SensorBox/WebContent/javascript/jquery.flot.stack.js
	SensorBox/WebContent/javascript/jquery.flot.symbol.js
	SensorBox/WebContent/javascript/jquery.flot.threshold.js
	SensorBox/WebContent/style.css
	SensorBox/src/uk/ac/dotrural/quality/ed/viewer/services/GetObservations.java
Merge github.com:cbaillie/SensorBox