Merge branch 'ListView' into develop

merged list into develop