Changed Added views icons [thumbnails and list] @todo \r\n Change to blocks
Merge branch 'edge' of github.com:chisimba/chisimba into edge