T1
T2
T6
Del
C1
C2
C3
C5
C6
C7
Merge branch 'test' of https://github.com/mhae/nio.git into test2

Conflicts:
	f1
Fix b1.1
new f3
Merge branch 'b1' into b1.1