Manual merge
Manual merge
Added netbeans/private/ to .gitignore