user.php and index.php modified
Merge branch 'master' of github.com:kalbooks/kalboko