Add file name conflict table (close #165, ref #155)

And also migrate to view-based table view
Merge branch 'refs/heads/feature/issue165_filenameConflict' into develop