Add count text parameter
Revise view markup as list
Add count text language string
Merge remote-tracking branch 'origin/develop' into develop