Conflicts:
	src/common/namedb/namedb.h
	src/common/namedb/namedb_trie.c
	src/libknot/descriptor.c
	src/libknot/packet/rrset-wire.c
	src/libknot/processing/requestor.c
	src/libknot/rrtype/aaaa.h

Resolver compat

See merge request !291

Conflicts:
	src/Makefile.am
	src/knot/conf/conf.h
	src/knot/server/server.h

fixes: persistent timers

See merge request !294

Also unified doxygen comments.

Conflicts:
	src/knot/nameserver/ixfr.c
	src/knot/nameserver/process_answer.c
	src/knot/nameserver/process_query.c
	src/knot/server/tcp-handler.c
	src/knot/zone/events/handlers.c
	src/libknot/dname.c
	src/libknot/processing/requestor.c
	src/libknot/rrtype/tsig.c