Resolved conflicts
Merge branch 'master' of ssh://github.com/barchart/barchart-feed
Updated trade types