last updates for emergent architecture design
Merge branch 'master' of github.com:ZimonD/ContextCG7