Tested transferring logs from emulator to server
merge n4 and master
Revise log entry format on emulator
NA
sync to home:mako:server