2.1.0.0 RC2
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	includes/js/initFsCMS.js
	kernel/fsCache.php