settingsView bugs fixed, labels normalized
Merge branch 'master' of https://github.com/dabrams888/cs4911-team-yay

Conflicts:
	DealGenda/en.lproj/MainStoryboard.storyboard