added .gitignore and merged from trunk