Rest API fix
Product API
Merge branch 'develop'