Fix mem leaks
Merge branch 'master' of github.com:0pq76r/lunkwill

Conflicts:
	core/server.c