Merge remote-tracking branch 'origin/dev-lic' into dev-lic

# Conflicts:
#	app/admin/controller/setting/Register.php