modified line breaks
Merge branch 'master' into homelistheight

Conflicts:
	brooch/en.lproj/InitStoryboard.storyboard
	brooch/en.lproj/MainStoryboard.storyboard