Just a few client side patches
cycling
Merge branch 'Vinny' of https://github.com/brainteam/BrainSphere.git into Vinny