Changes to get rid of NULLException and BeatManager working with other managers
resolving merge conflicts
Merge branch 'master' of https://github.com/cptcaveman/DJ_Gone_Rogue
Merge pull request #40 from cptcaveman/dovlu

Dovlu