lol
lol

Conflicts:
	contact-build-desktop/Makefile
	contact-build-desktop/Makefile.Debug
	contact-build-desktop/Makefile.Release
	contact-build-desktop/ui_help.h
	contact-build-desktop/ui_mainwindow.h
lol