Made target coordinates persistent.
Made sure Joke module is disabled unless user enables it.
Merge remote-tracking branch 'upstream/dev' into dev