GUI changes (Problem)
Merge
Merge branch 'master' of https://github.com/messianos/pci_server.git

Conflicts:
	lib/libpci_skin.so