deleted nand_test
Merge branch 'branch1.1'