boozzh
Merge remote-tracking branch 'origin/master'

Conflicts:
	FrameWork1/RuleClass/Tools/ImageObject.php
boozzh