Merge pull request #532 from leider/master

removed functions from activity / waiting list clean up on registration
- rendering of resource options moved to own file
- added removing from waiting list
small typo bug + changed the way the function is exposed
removed unused require
separation of display concerns
reverted some changes
separation of display concerns - finished