fixed some mergers with all other shit hehe
Fixed all mergeporblems, the new tabledata model have not been merge yet, John do not fix thistonight we have a plan! :). We will fix it tomorrow