Merge branch 'master' into Daniel
Fixed Add Products Functionality
Merge branch 'Daniel'