icon and logo
Merge branch 'dev' of https://github.com/adwa/adwatest into dev