developing
finish samsung api
Merge branch 'feature/changeFlowSamsungAPI' into develop