Conflicts:
	core/templates/login.php
	index.php
	lib/util.php