added new entry button from wine list view
fixed conflicit
Merge Develop into ViewWineActivity