fixes
Merge branch 'master' of https://github.com/Grapheme/dah-sl

Conflicts:
	public/js/libs/guest.js