Merge tag '0.9.6' into develop

Released 0.9.6 0.9.6
fixed user experience in the properties of the orm widgets
bumped version
Merge branch 'release/0.9.7'