update for master, add gradle configuration for server