Potential new icon
Merge branch 'develop'
Changed rest documentation to markdown format