Removed redundant orderby
Better ordering of events in monthview
Merge remote-tracking branch 'origin/master'