made some changes
Merge branch 'kasa-dev' into NewOne

Conflicts:
	GreenhouseGraphing/src/dao/MangoDAO.java
	GreenhouseGraphing/src/dao/MangoMapper.xml
made some changes
Merge pull request #16 from raskasa/newOne

New one