Merge branch 'master' of https://github.com/susannekaiser/artwise

Conflicts:
	server/mapper.js