Merge origin/master

Conflicts:
	resources/lib.inc.php
	resources/log.txt
Merge origin/master