fix merge conflict 0.7.x 0.8.x in util.php and register.php.

diff --cc README
Simple merge

diff --cc actions/register.php
Simple merge

diff --cc lib/util.php
Simple merge