launcher
Merge branch 'master' of github.com:pidgeonproject/pidgeon

Conflicts:
	build/install.sh
	pidgeon.desktop
Merge branch 'master' into ubuntu

Conflicts:
	build/install.sh
	pidgeon.desktop