testing
testing conflicts
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T1_lotfy_1.8#
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T1_lotfy_1.8#
commiting latest updates
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T1_lotfy_1.10
1.10 checking out the shopping cart
Merge pull request #248 from DevYah/T1_lotfy_1.10

T1 lotfy 1.10