Conflicts:
	.travis.yml
	lib/SimpleSAML/XHTML/Template.php
	modules/authX509/lib/Auth/Source/X509userCert.php
	modules/authYubiKey/www/yubikeylogin.php
	modules/authorize/www/authorize_403.php
	modules/consent/lib/Auth/Process/Consent.php
	modules/consent/lib/Logout.php
	modules/consent/templates/consentform.php
	modules/consent/www/getconsent.php
	modules/consent/www/noconsent.php
	modules/core/www/authenticate.php
	modules/core/www/frontpage_config.php
	modules/core/www/no_cookie.php
	modules/core/www/show_metadata.php
	modules/discopower/lib/PowerIdPDisco.php
	modules/expirycheck/www/about2expire.php
	modules/expirycheck/www/expired.php
	modules/memcacheMonitor/www/memcachestat.php
	modules/metarefresh/hooks/hook_frontpage.php
	modules/multiauth/www/selectsource.php
	modules/oauth/hooks/hook_cron.php
	modules/oauth/lib/Consumer.php
	modules/oauth/lib/OAuthServer.php
	modules/oauth/lib/OAuthStore.php
	modules/oauth/lib/Registry.php
	modules/oauth/www/getUserInfo.php
	modules/oauth/www/registry.edit.php
	modules/oauth/www/registry.php
	modules/statistics/www/showstats.php
	templates/_footer.twig
	templates/includes/header.php