testing pull request again
Merge branch 'refs/heads/pullreq'

Conflicts:
	UITabBar+CustomStyle.h