Added nbproject to .gitignore.
Merge origin/master