Merge commit 'origin/master' into hruid

diff --cc modules/carnet.php
Simple merge

diff --cc modules/forums.php
Simple merge

diff --cc modules/lists.php
Simple merge

diff --cc modules/register.php
Simple merge

diff --cc modules/search.php
Simple merge