hotfixes merge
hotfixes merge

Conflicts:
	builder/LocaleFileGenerator.class.php

RBSWebFactory/framework,RBSWebFactory/framework,RBSChange/framework,RBSWebFactory/framework,RBSChange/framework,RBSChange/framework