project list markup change ready for restyle
merge conficts
Merge branch 'develop' into release-0.2.5