delta rain
Merge branch 'master' of https://github.com/ristes/apple-game

Conflicts:
	app/controllers/HarvestingController.java
	public/javascripts/ng/controllers/operations/harvesting.js