Merge branch 'release-1.1' into develop
fixed a bug
fixed a view bugs
add storage a improvement
Bumped version number to 1.2
Merge branch 'release-1.2'