Updated submodules
Minor header guard renaming
Magic netbeans project changes