working
Merge branch 'master' of https://github.com/mathiasth/sxp-web-app

Conflicts:
	helpers/msgreceiver.js