Fix
Merge branch 'gh-pages' of https://github.com/fmeus/www into gh-pages

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