Sort event display
added alert modals and fixed signin message
cleaning up
fixing merge conflicts
Merge branch 'master' into cssedits
Fix server