changed styel of back button and edit button
テキストまわり調整
mergeする
Merge branch 'master' into broochview

Conflicts:
	brooch/en.lproj/MainStoryboard.storyboard