update test view
Merge branch 'master' of github.com:waterlou/UIGlossyButton

Conflicts:
	UIGlossyButton.xcodeproj/project.pbxproj
	UIGlossyButton/TestButtonViewController.xib