Added apple trees and blueberry bushes

Removed electrohack check if ID card is used

Conflicts:

	README.md
	game.cpp
	mapdata.h
Added foraging for wild vegetables, results depends on survival skill

Conflicts:

	README.md
	itype.h
	pldata.h
Cleanup trailing whitespace, again.
Indentation cleanup.