Fix netbeans project
Merge branch 'master' into ui