Merged branches, caused some issues going between windows and osx for netbeans