Merge pull request #192 from 5150Joker/dev

Dynamic Market - fuck the persistent one, we're going with this.
Merge pull request #193 from 5150Joker/dev

Syntax + Masterhandler for market