POS-1212: committing file_2 by user1
Merge branch 'develop' of https://github.com/ramaraoyerramsetti/shopping-cart into develop