update notifications, desktop landing page
Merge branch 'master' of https://github.com/zporges/achieve

Conflicts:
	src/server/routes.js