changes to assets display page
updating assets branch
merged logged in page
merge assets and master