Merge branch 'master' into Test1
Merge remote-tracking branch 'origin/master' into Test1
a
Merge remote-tracking branch 'origin/Test2'

Conflicts:
	hello.tpl
master