Readded gradle wrapper, renamed ServerProxy to CommonProxy