Fixed rpmbuild script git version bug
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	rpmbuild.sh