Merge branch 'master' of https://github.com/71104/asset-manager