hide keyboard during load
Merge branch 'master' of https://github.com/UpstreamApp/Upstream
fixed merge conflict