updated branch for online_store
Merge branch 'develop'