Added files from latest Karol's commits to Netbeans project (compilation fix)