Separated configuration from public repository

This makes it possible to have local configurations and a central
version management
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.njs