image organization 

irrigation started
od koki :)
Merge branch 'master' of https://github.com/ristes/apple-game.git

Conflicts:
	app/controllers/WeatherController.java
	app/dto/DayWeatherDao.java
	app/models/Day.java