Merge "add save & deploy button in designer"