Merge pull request #365 from johngian/773647

[Fix bug 773647] Initial implementation of categories in events
[fix bug 851464] Detailed voting view.
[fix bug 851464] Added detailed voting view and vote view.