Merge pull request #12 from raskasa/kopra-dev

Kopra dev
Merge branch 'master' into kasa-dev
run report page has some basic functionality... templates are pulled
form the DB and the sensor data is graphed. needs to add manual data
graphing and multi line charts
Added logic for updating template
Added database queries for updating a report template
added required fields to forms
Manual data charts now included when report is run
Merge branch 'crmaykish' of https://github.com/raskasa/papaya.git into
crmaykish

Conflicts:
	GreenhouseGraphing/build/classes/dao/MangoMapper.xml
	GreenhouseGraphing/build/classes/dao/config.xml
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
Multi-line charts basically working...
Merge branch 'crmaykish' of https://github.com/raskasa/papaya into kopra-dev
made some changes
made some changes
Refactored test cases.
Quick fix.
Merge branch 'kopra-dev' into kasa-dev

Conflicts:
	GreenhouseGraphing/src/actions/EditReportTemplateAction.java
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
Connected edit report template views with actions - need to database operations; issue with iterating over collection twice in JSP.
Consolidated manual data additions from Jeff and Matt; Completed editing report template functionality.
Merge pull request #14 from raskasa/kasa-dev

Kasa dev