Adding basic filtering
Upgrade to latest SilverStripe 3.1.x
Merge branch 'feature/filtering'
Template content fix
template fix
Home events
FIX
Adding event link
Adding all link
Merge branch 'master' into theme

* master:
  Adding all link
  Adding event link
  FIX
  Home events
  template fix
  Template content fix
  Upgrade to latest SilverStripe 3.1.x
  Adding basic filtering

Conflicts:
	mysite/code/extensions/CalendarPage_ControllerExtension.php
	themes/loveyourwater/templates/Layout/CalendarPage_myevents.ss
	themes/loveyourwater/templates/Layout/EventCreatePage.ss