added environments, master-server

Signed-off-by: Ilan Goldenstein <ilan.goldenstein@ravellosystems.com>