BugView added, some logic update
bugView added
Merge branch 'bugView' into develop
some logic update