p2 m1

Change-Id: Ifa2900783dcc4fc4838d805caa141e7c6add48b7
Signed-off-by: Qingjian Wang <wxjlibra@163.com>
Merge branch 'master' of ssh://git@github.com/wxjlibra/practise.git

Conflicts:
	p2/src/main/java/p2/Test2.java