three commit

Signed-off-by: leelyndan <li.linhan@163.com>
Merge branch 'master' of https://github.com/leelyndan/CodeRepository

Conflicts:
	commonwebframe/src/main/java/commonwebframe/HelloWorld.java