Merge origin/master

Conflicts:
	rep/prod.php
	resources/lib.inc.php