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
added the ability to select datapoints
Category functions working.
did alot
Added description field for report template creation view.
Consolidated front-end and back-end for report template  creation.  Needs to be tested.
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
Bugfix on saving a new report template.
finished Display a List of Reports and Selecting data sensors and manual data (phase 1) for creating a new report template
Quick bug fix on saving a report template.
Font-end for editing a report template almost complete; need to figure out how to pre selected associated sensors.
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