Merge branch 'master' of https://github.com/ocombe/assetsmanager-brunch