pre-merge
merge
Added recent events to the homepage and improved the way urls work.
merged feed into develop