manual data
manual data
corrected some style issues
Some basic sensor data graphing is working with Chart.JS. Not 100% on
that library though, no export capabilities. May switch to Highchart.
all broken...
Merge remote-tracking branch 'origin/kopra-dev' into crmaykish

Conflicts:
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/config.xml
	GreenhouseGraphing/src/models/ManualData.java
	GreenhouseGraphing/src/struts.xml
Merge remote-tracking branch 'origin/kasa-dev' into crmaykish

Conflicts:
	GreenhouseGraphing/WebContent/pages/newReportTemplate.jsp
	GreenhouseGraphing/build/classes/dao/MangoMapper.xml
	GreenhouseGraphing/build/classes/dao/config.xml
	GreenhouseGraphing/build/classes/struts.xml
	GreenhouseGraphing/src/actions/NewReportTemplateAction.java
Quick fix