Many much edit
Merge origin/Netbeans into Netbeans