Addresses issue #1667
Choosing not to study still reads the book for one step
Merge tweak to continuous study activation.

Conflicts:
	game.cpp
	player.cpp