Add feature2, remove master-testgit2