fix

split alerts
upload settings
move alert to child side
Finally fix!!!!
done
y
Merge branch 'master' into Xy-Tan-Test