Merges with v:\kaori-secode\php-DemoV1-ImageCLEF12