link to github, no more survey
removed untracked
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore
	scripts/cfgserver.sh