after merge...
after merge...
updates
Merge branch 'oldversion'

Conflicts:
	InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
	InAppSettingsKit/Models/IASKSettingsReader.m
	InAppSettingsKit/Models/IASKSpecifier.m