changes made
Merge remote-tracking branch 'origin/master'

Conflicts:
	SPA-Crowd-Chat-API/scripts/config.js