Merge FTP
Merge origin/master

Conflicts:
	actions/register_user.php
	conf/config.php