Premerge commit
Fixed merge conflicts and started working on genericbroker
Merge branch 'master' of github.com:tOgg1/WS-Nu