Modified some server side & client side functionality
Merge branch 'master' of https://github.com/vgaviria/leopard_strike