merge
update negotiation combination function
complete negotiation export function
Merge branch 'raven' of https://github.com/ludwiksh/Etales
info
merge from master
Merge branch 'master' of https://github.com/ludwiksh/Etales into ravena
merge from master
market report