Sorted events display.
Merge branch 'master' of github.com:royk/new_modified
Fixed events controller