fixed a string issue
doc add
Merge branch 'develop' into salon
solve credit issue
fix conflicts
worked on coupon and packages