pic changes
Merge branch 'master' of https://github.com/ristes/apple-game

Conflicts:
	public/images/game/operations/landtreatman/pocva-riste-green-high.png
	public/images/game/operations/landtreatman/pocva-riste-green-medium.png
weather info style change