update warning
Merge remote-tracking branch 'origin/master'
minor update and add warning view after registration
Merge remote-tracking branch 'origin/master'