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