Changes to assets
Merge branch 'master' into view_events
Styling
Merge pull request #21 from danlinde/view_events

View events