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
Category functions working.
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