Refactored a few more classes to use BaseMonoBehaviour
Fixed an issue with comparing networkplayer instances
Merge branch 'origin/master'

to use BaseMonoBehaviour
Fixed an issue with comparing networkplayer instances
Merge branch 'origin/master'
Merge branch 'origin/master'