Bugs removed from Onlinetool
Removed some files
Merge