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 remote-tracking branch 'origin/crmaykish' into categories
merged colin's branch