server: added json module
Merge branch 'master' of github.com:KrystianD/kdhome

Conflicts:
	.gitmodules