removed old products controller and views
Merge branches 'develop' and 'master'