manual data
manual data
corrected some style issues
Merge remote-tracking branch 'origin/kopra-dev' into crmaykish

Conflicts:
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/config.xml
	GreenhouseGraphing/src/models/ManualData.java
	GreenhouseGraphing/src/struts.xml