correct comment removal
Merge branch 'master' into developer
change picture format