Merge branch 'master' of https://github.com/jimkaprod/_lpct

Conflicts:
	_bdd/lpct.mwb
	_bdd/lpct.mwb.bak
Merge remote-tracking branch 'origin/master'