test
Merge branch 'feature1'

Conflicts:
	build_patch_rpm.sh
Merge pull request #1 from TieWei/master

git test