Signed-off-by: johnnywww <johnnywww@gmail.com>
Merge branch 'master' of github.com:johnnywww/nvtonvifserverc

Conflicts:
	runDeviceService.c

Signed-off-by: johnnywww <johnnywww@gmail.com>