Merging client & server
Merging client & server

nitishch/springseed,nitishch/springseed,byhestia/springseed,Swizz540/springseed,Swizz540/springseed,Swizz540/springseed,nitishch/springseed,wolf9s/springseed,byhestia/springseed,wolf9s/springseed,byhestia/springseed,wolf9s/springseed