Merge remote-tracking branch 'origin/master'

Conflicts:
	Config/dbconfig.js
Merge remote-tracking branch 'origin/master'