Merge branches 'local' and 'master' into local
Merge branch 'master' into local
delete log file, change stdsoap2.h , change Makefile, change nsmap definition