add_cat
Merge branch 'validation_branch'

Conflicts:
	tmp/pids/server.pid