Linux commint
Merge branch 'master' of https://github.com/Imote/Uplimg

Conflicts:
	Uplimg.pro
	filesendedsound.cpp
	screenmanager.cpp