merge
Merge branch 'raven' of https://github.com/ludwiksh/Etales
fix retailer
fix retailer
negotiation export
merge
merge
Merge branch 'raven' of https://github.com/ludwiksh/Etales
merge
merge
Merge branch 'raven' of https://github.com/ludwiksh/Etales
decision for period 1
update
Merge branch 'master' of https://github.com/ludwiksh/Etales into raven
'merge from master'