Add settings modal view for search options
Merge branch 'master' into add-settings

Conflicts:
	generika.xcodeproj/project.pbxproj
Update to store selected options into userDefaults