Refactored settings view controllers
Merge branch 'develop'

Conflicts:
	Uchatu/SettingsViewController.swift