Updates to shop

finished buying state
edits to town and battle to move and wait based on time
Merge remote-tracking branch 'origin/master'

Conflicts:
	Engine/Engine/Battle.cpp
	Engine/Engine/Shop.cpp