merged capify branch
updated nginx conf