add DisableSubviews as a submodule to QS
add the DisableSubviews category to the Xcodeproj
Disable catalog entry settings if entry is a preset
Add DisableSubviews submodule dir to gitignore
Rebase against master
Merge branch 'master' of github.com:quicksilver/Quicksilver into disableCatalog

Conflicts:
	Quicksilver/Quicksilver.xcodeproj/project.pbxproj
Fix merge conflict problems
Merge pull request #1341 from pjrobertson/disableCatalog

Disable catalog preset options in drawer