Line ending struggles.
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Fix missing -webkit-flex in CSS
Add fakeevents management command to create sample events
Merge branch 'master' of github.com:aspc/mainsite
Merge branch 'master' into staging