add .gitignore and merge svn r852