Merge pull request #4 from xenLiam/master

Tons of fixes
Update login_screen.php

Remove openid reference to fix blank screen
remove openid refernce
Merge pull request #1 from icebb/master

Sync #1