Merge pull request #1 from darkfadr/content

updated some features of style for UpMe
refactored category views; added event viewing page; commented out dash dropdown; added new properties to events
removed merge conflict bs from overrides
removed redundant code
Merge pull request #2 from darkfadr/content

Content Update