Merge pull request #816 from lev-kuznetsov/master

Adding log4js logger via a require module
Merge remote-tracking branch 'upstream/master'