Merge Netbean/testRemote