Merge branch 'master' into develop
correct build icons
add services name
correct get version
Merge branch 'develop'