Develop

keep my develop branch up to date with Panique's upstream php-login/develop branch