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

Conflicts:
	app/controllers/HarvestingController.java
	public/javascripts/ng/controllers/operations/harvesting.js
other refactoring
Merge branch 'master' of https://github.com/ristes/apple-game.git

Conflicts:
	app/service/impl/ContextServiceImpl.java
- game initialization refactoring
- planting refactoring
harvesting changes
Merge branch 'master' of https://github.com/ristes/apple-game

Conflicts:
	app/controllers/HarvestingController.java
	app/service/HarvestService.java
work on harvesting
Add vagrant provisioning. Implement harvesting game
plantation model modifications
update 04.11.2014
9.11.2014
Merge branch 'master' of https://github.com/ristes/apple-game.git
badges, diseases by base, fridges, thief, tips
- partial refactoring (code cleaning) 
- Initial bootstraping of the stores and the items
- Added images for harvesting
Merge branch 'master' of https://github.com/ristes/apple-game.git
resolved conflicts
Merge pull request #1 from marjan-georgiev/harvest_game

Add vagrant provisioning. Implement harvesting game
ng-src