UI Changes
Changed color of userlist
Fixed merge conflicts
Fixed errors
Merge branch 'master' of https://github.com/allthetime/RTCInsanity