added client folder
merge master
merge develop