General Development
Merge remote-tracking branch 'origin/Nightly' into Nightly

Conflicts:
	config/config.json
	system/core/SFFM.js
	system/core/sql.js