Merge remote-tracking branch 'mannol1/master'

Conflicts:
	configure.ac
	toxmsi/Makefile.inc
	toxmsi/msi_impl.h
	toxmsi/msi_message.h
	toxmsi/phone.c
	toxrtp/Makefile.inc
	toxrtp/rtp_helper.c
	toxrtp/rtp_impl.c
	toxrtp/tests/test_bidirect.c
	toxrtp/tests/test_headers.c
Merge branch 'master' of https://github.com/Martijnvdc/ProjectTox-Core

Conflicts:
	configure.ac
	toxmsi/Makefile.inc
	toxmsi/msi_impl.h
	toxmsi/msi_message.h
	toxmsi/phone.c
	toxrtp/Makefile.inc
	toxrtp/rtp_helper.c
	toxrtp/rtp_impl.c
	toxrtp/tests/test_bidirect.c
	toxrtp/tests/test_headers.c