merge fix
removed net beans files