Fixing some minor bugs

- Calendar magellan removed, needs rework too
- Commented old calendar
Merge branch 'develop' of github.com:guluc3m/gul-gultalks into develop
Order activities in calendar