New images and compressed images
Shrunk images
Merge branch 'master' into gh-pages

Conflicts:
	serverapp-pushnotifications.png
	serverapp-settings.png