badgeviewのbadgeとbtnの位置調整
Merge branch 'master' into badgeBackgroundImageFix

Conflicts:
	gyoumuApp1/Base.lproj/Main.storyboard
otherBadgeのbadgeとbtnの位置修正
Merge pull request #151 from FUNPBL2014P2/badgeBackgroundImageFix

Badge background image fix
closed #138