client commit
Merge branch 'master' of https://github.com/VuNguyen2013/AssetManager