asset manager
Merge branch 'edbert'