LAC-14 Add logging capabilities to project's modules
LAC-14 Merged master fixed conflict.
Merge remote-tracking branch 'origin'