Update
Merge branch 'master' of github.com:craftsmancoding/assetmanager
fix conflict style