fixed a string issue
doc add
Merge branch 'develop' into salon