merging source code while I have fixed bugs on BugSense step by step.