remove unneeded gitmodules file
apply patch to sync with current local version
update README file
Merge branch 'hotfix-merge-local'