Add the new icon file for pc-bootconfig
Add the new pc-bootconfig icon to the pkg-plist
Merge branch 'master' of github.com:pcbsd/pcbsd

Conflicts:
	src-qt4/port-files/pkg-plist