delete svn/wc.db
Merge branch 'master' into bo_crud