task 668 . Views and fix some bugs
Merge branch 'origin/develop'