fix org navigation bug
Merge branch 'mergeFix' of https://github.com/TheHoneybadgers/frop into event_approval

Merged in updates to approval/disapproval.
Merge pull request #52 from DevinGonzalez/event_approval

Fixed org navigation issues