edit log message
add setDateFormat for Gson
Merge remote-tracking branch 'origin/master'