With Netbeans 2
Merge origin/master