Resolved conflicts from develop to master.
Resolved conflicts from develop to master.

Merging develop into master, since coverity is hooked up to master to check for problems.

Conflicts:
	check/signet/check_signet.c
	include/signet/general.h
	include/signet/signet.h
	libs/dmessage/parser.c
	libs/signet/signet.c

greyg00s/libdime,greyg00s/libdime,lavabit/libdime,lavabit/libdime,lavabit/libdime,lavabit/libdime