Added feed view screen
Merge heads