holidays changes
Merge branch 'master' of https://github.com/khcr/neurones

Conflicts:
	tmp/pids/server.pid