fixed refresh
implemented network error view
Merge remote-tracking branch 'origin/master'