Events
Fix merge for events
Event, working on the update
Event calendar without css
Merge branch 'master' of https://github.com/ReturnToLife/ws into event
Merge branch 'event' of https://github.com/ReturnToLife/ws into event
Update events
Merge branch 'event' of github.com:ReturnToLife/ws