Merge branch 'fabrixxm-master'

Conflicts:
	boot.php

diff --cc boot.php
Simple merge

diff --cc include/auth.php
Simple merge

diff --cc index.php
Simple merge

diff --cc mod/openid.php
Simple merge