View list in a Table
Merge branch 'develop'