Revert "chada 2"

This reverts commit c571be91c5a37b0c01583922cf64f9b86f02b66d.
Revert "test whan"

merge confilct
	php/imagetoDB.php
prepare merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/imagetoDB.php