add ip camera, fix log crash issue
Merge remote-tracking branch 'origin/master'