Merge changes in dev
First go at homepage UI
fix bugs, media 404s
merge conflict resolution