Added Wine Tasting information addition screens.
Merge branch 'master' into develop
Merged with master