Cleanup
Merge branch 'master' of https://github.com/KoKuToru/gTox

Conflicts:
	Dialog/DialogContact.cpp