Merge tag '0.2.1' into develop

Released-0.2.1 0.2.1
improved entry log model for scaffolding
bumped version
Merge branch 'release/0.2.2'