Develope

Merging in updates for Lottery starting at block height 2400