Merge pull request #10 from raskasa/kasa-dev

Kasa dev
Merge branch 'master' into kasa-dev
Added logic for updating template
Added database queries for updating a report template
added required fields to forms
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 branch 'crmaykish' into kasa-dev

Conflicts:
	GreenhouseGraphing/build/classes/dao/MangoMapper.xml
	GreenhouseGraphing/src/actions/RunReportAction.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
Consolidated my and Colin's code.
Merge branch 'kasa-dev' into NewOne

Conflicts:
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
made some changes