change before the freeze)
Conflicts: dev/initdata/savedemo.sh htdocs/filefunc.inc.php htdocs/user/card.php