improved player-potion interaction

player-potion marriage now legal in ny
Merge branch 'master' of https://github.com/nsgomez/txtmagicka

Conflicts:
	Staff.ctxt