Test1
Merge remote-tracking branch 'origin/Test2'

Conflicts:
	hello.tpl
aa
Merge pull request #1 from hnql/Test1

aa
Merge pull request #2 from hnql/Test2

aa
Merge branch 'master' into Test1