schedule for products and services: conflicts are shown in a grid with a summary of dates in conflict.
Entities, vendors now can add products and services within a single window.
Merge branch 'master' of https://github.com/resultares/esolutions