Add icons
Merge branch 'master' into develop
Add link for sample app