Merged client assets branch to master branch