update user
Merge remote-tracking branch 'origin/master'

Conflicts:
	backend/config/main.php