Remove the old life-preserver from the src-qt4/life-preserver dir, and replace it with src-qt4/life-preserver/lp-tray and src-qt4/life-preserver/lp-gui.
Update the pkg-plist for the new life-preserver utilities.
Update the control panel entry for life preserver to startup up the tray only (non-root)
Update the system startup script for life-preserver to start up the life-preserver tray as user.
Merge branch 'master' of github.com:pcbsd/pcbsd

Conflicts:
	src-qt4/life-preserver/i18n/LifePreserver_af.ts
	src-qt4/life-preserver/i18n/LifePreserver_ar.ts
	src-qt4/life-preserver/i18n/LifePreserver_az.ts
	src-qt4/life-preserver/i18n/LifePreserver_bg.ts
	src-qt4/life-preserver/i18n/LifePreserver_bn.ts
	src-qt4/life-preserver/i18n/LifePreserver_bs.ts
	src-qt4/life-preserver/i18n/LifePreserver_ca.ts
	src-qt4/life-preserver/i18n/LifePreserver_cs.ts
	src-qt4/life-preserver/i18n/LifePreserver_cy.ts
	src-qt4/life-preserver/i18n/LifePreserver_da.ts
	src-qt4/life-preserver/i18n/LifePreserver_de.ts
	src-qt4/life-preserver/i18n/LifePreserver_el.ts
	src-qt4/life-preserver/i18n/LifePreserver_en_GB.ts
	src-qt4/life-preserver/i18n/LifePreserver_en_ZA.ts
	src-qt4/life-preserver/i18n/LifePreserver_es.ts
	src-qt4/life-preserver/i18n/LifePreserver_et.ts
	src-qt4/life-preserver/i18n/LifePreserver_eu.ts
	src-qt4/life-preserver/i18n/LifePreserver_fa.ts
	src-qt4/life-preserver/i18n/LifePreserver_fi.ts
	src-qt4/life-preserver/i18n/LifePreserver_fr.ts
	src-qt4/life-preserver/i18n/LifePreserver_fr_CA.ts
	src-qt4/life-preserver/i18n/LifePreserver_fur.ts
	src-qt4/life-preserver/i18n/LifePreserver_gl.ts
	src-qt4/life-preserver/i18n/LifePreserver_he.ts
	src-qt4/life-preserver/i18n/LifePreserver_hi.ts
	src-qt4/life-preserver/i18n/LifePreserver_hr.ts
	src-qt4/life-preserver/i18n/LifePreserver_hu.ts
	src-qt4/life-preserver/i18n/LifePreserver_id.ts
	src-qt4/life-preserver/i18n/LifePreserver_is.ts
	src-qt4/life-preserver/i18n/LifePreserver_it.ts
	src-qt4/life-preserver/i18n/LifePreserver_ja.ts
	src-qt4/life-preserver/i18n/LifePreserver_ka.ts
	src-qt4/life-preserver/i18n/LifePreserver_ko.ts
	src-qt4/life-preserver/i18n/LifePreserver_lt.ts
	src-qt4/life-preserver/i18n/LifePreserver_lv.ts
	src-qt4/life-preserver/i18n/LifePreserver_mk.ts
	src-qt4/life-preserver/i18n/LifePreserver_mn.ts
	src-qt4/life-preserver/i18n/LifePreserver_ms.ts
	src-qt4/life-preserver/i18n/LifePreserver_mt.ts
	src-qt4/life-preserver/i18n/LifePreserver_nb.ts
	src-qt4/life-preserver/i18n/LifePreserver_ne.ts
	src-qt4/life-preserver/i18n/LifePreserver_nl.ts
	src-qt4/life-preserver/i18n/LifePreserver_pa.ts
	src-qt4/life-preserver/i18n/LifePreserver_pl.ts
	src-qt4/life-preserver/i18n/LifePreserver_pt.ts
	src-qt4/life-preserver/i18n/LifePreserver_pt_BR.ts
	src-qt4/life-preserver/i18n/LifePreserver_ro.ts
	src-qt4/life-preserver/i18n/LifePreserver_ru.ts
	src-qt4/life-preserver/i18n/LifePreserver_sa.ts
	src-qt4/life-preserver/i18n/LifePreserver_sk.ts
	src-qt4/life-preserver/i18n/LifePreserver_sl.ts
	src-qt4/life-preserver/i18n/LifePreserver_sr.ts
	src-qt4/life-preserver/i18n/LifePreserver_sv.ts
	src-qt4/life-preserver/i18n/LifePreserver_sw.ts
	src-qt4/life-preserver/i18n/LifePreserver_ta.ts
	src-qt4/life-preserver/i18n/LifePreserver_tg.ts
	src-qt4/life-preserver/i18n/LifePreserver_th.ts
	src-qt4/life-preserver/i18n/LifePreserver_tr.ts
	src-qt4/life-preserver/i18n/LifePreserver_uk.ts
	src-qt4/life-preserver/i18n/LifePreserver_uz.ts
	src-qt4/life-preserver/i18n/LifePreserver_vi.ts
	src-qt4/life-preserver/i18n/LifePreserver_zh_CN.ts
	src-qt4/life-preserver/i18n/LifePreserver_zh_HK.ts
	src-qt4/life-preserver/i18n/LifePreserver_zh_TW.ts
	src-qt4/life-preserver/i18n/LifePreserver_zu.ts