fix Logger. Add error.log support.
Merge remote-tracking branch 'origin/develop' into develop