Merge branch 'developer'
remove pictures
Merge branch 'master' into developer