Allow reward type to be configured in coin definition instead of auto detected
Initial x15 support
Merge remote-tracking branch 'upstream/master'