update views
index page
Merge branch 'staging' into front
front page redesign
merge conflicts