grid view now shows both local and shared stories in browse
fixed conflicts