Updated log file, and removed useless file.
Merge branch 'master' into NOV_branch_0.0.7.0