Added step 5 of assets.module (Gary)
Merge branch 'develop' into feature-persons