Implemented better logging using log4js
Merge branch 'logger' into develop