Fixed some warnings
Fixed some warnings
Added irungentoo's fix
Merge branch 'master' of https://github.com/mannol1/ProjectTox-Core

Conflicts:
	toxmsi/phone.c