Merge branch 'master' of https://github.com/sueno/Checkers

Conflicts:
	php/action/LoginAction.php