changed the logging style in the project to be same everywhere
fixed some merge conflicts
Resolving merge conflicts
Merge pull request #64 from hi3g/logger_fix

changed the logging style in the project to be same everywhere