splash
splash
Merge remote-tracking branch 'origin/master'
autologin view, child approves