rollback require rwoverdijk/assetmanager to dev-master