no message
Merge branch 'master' of https://github.com/majdal/modex

Conflicts:
	src/frontend/components/PlayPause.js
Merge branch 'master' of https://github.com/majdal/modex