* admin now is done through unix socket
* merging conflict solved
Merge branch '18f57cc9d6bc581f3e1019d7f30a672c86e5f665' into dev

Conflicts:
	control-server.c
	core.c
	core.h
	main.c
	plugin.c
	socket.c