Quick fix
Leftover resources from Colin's branch.
Creating and fetching ReportTemplates working.
prepping to merge matt's template stuff
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
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