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.
Initial implementation of Report Template creation front-end complete.
all broken...
Added a foreign key for the chart configuration model.
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
- Switched graphing library to Highcharts
- Added data interpolation helper class DataUtils
- Added timestamp/epoch helper class TimeUtils
Merge remote-tracking branch 'origin/crmaykish' into savingReportTemplate

Conflicts:
	GreenhouseGraphing/WebContent/decorators/decorator.jsp
	GreenhouseGraphing/src/actions/NewReportTemplateAction.java
	GreenhouseGraphing/src/actions/SensorSelectAction.java
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
	GreenhouseGraphing/src/dao/config.xml
	GreenhouseGraphing/src/models/ChartConfiguration.java
	GreenhouseGraphing/src/models/ManualData.java
	GreenhouseGraphing/src/models/ReportTemplate.java
	GreenhouseGraphing/src/models/Sensor.java
Report templates save and retrieve chart configs.
cleanup
added getAllReportTemplates in dao.
This branch is broken. ;(