sdwq
Merge branch 'master' of github.com:rkophs/ideserver

Conflicts:
	conf.json
Merge branch 'master' of github.com:rkophs/ideserver
Merge branch 'master' of github.com:rkophs/ideserver