Merge branch 'master' of github.com:maxious/ACTBus-ui

Conflicts:
include/common-auth.inc.php
lib/openid-php/Auth/OpenID/Consumer.php
lib/openid-php/Auth/OpenID/Server.php
lib/openid-php/Auth/OpenID/TrustRoot.php
lib/openid-php/Auth/Yadis/Manager.php
lib/openid-php/Auth/Yadis/XRDS.php