Integrated merged classes, added check-in.txt, added PrefsManager