FEF
Merge branch 'master' into working
Merge branch 'master' into working
added CNF to current marketstate
for merging with working
Merge branch 'working'