Event, Market: ArrayList -> ConcurrentHashMap
Merge remote-tracking branch 'origin/master'