- Switched graphing library to Highcharts
- Added data interpolation helper class DataUtils
- Added timestamp/epoch helper class TimeUtils
Merge pull request #11 from raskasa/crmaykish

Crmaykish
updated new report template page
initial categories insert, select, delete
initial categories insert, select, delete
Merge remote-tracking branch 'origin/savingReportTemplate_fixed' into categories

Conflicts:
	GreenhouseGraphing/build/classes/.gitignore
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
	GreenhouseGraphing/src/dao/config.xml
prepping to merge matt's template stuff
added the ability to select datapoints
Sensors graphed from report templates stored in db. Need to add manual
data and complex charts.

Merge remote-tracking branch 'origin/savingReportTemplate_fixed' into
crmaykish

Conflicts:
	GreenhouseGraphing/build/classes/.gitignore
	GreenhouseGraphing/build/classes/dao/MangoMapper.xml
	GreenhouseGraphing/build/classes/dao/config.xml
Category functions working.
did alot
changed things
Merge branch 'crmaykish' into kopra-dev

Conflicts:
	GreenhouseGraphing/WebContent/decorators/decorator.jsp
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
	GreenhouseGraphing/src/dao/config.xml
	GreenhouseGraphing/src/struts.xml
Merge remote-tracking branch 'origin/categories' into kopra-dev

Conflicts:
	GreenhouseGraphing/src/dao/MangoMapper.xml
	GreenhouseGraphing/src/dao/config.xml
	GreenhouseGraphing/src/models/Category.java
changed things
changed things
finished Display a List of Reports and Selecting data sensors and manual data (phase 1) for creating a new report template
Merge branch 'kopra-dev' into kasa-dev

Conflicts:
	GreenhouseGraphing/WebContent/pages/newReportTemplate.jsp
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
	GreenhouseGraphing/src/struts.xml
Creating a new report template works after merging with Jeff's code.