changed images
Merge branch 'master' into server-development