minor modifications
Merge branch 'master' of https://github.com/anlif/sanntid

Conflicts:
	ov2/network/client/client.go
Merge branch 'master' of https://github.com/anlif/sanntid
Merge branch 'master' of https://github.com/anlif/sanntid
added cJSON