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
Add a 'resolvesProxy' bool for actions that shouldn't resolve proxies. Fixes #1342

After a recent change (cd54162) all objects were being resolved before being sent to actions.
This shouldn't happen in some cases (e.g. assign abbreviation)
Merge pull request #1341 from pjrobertson/disableCatalog

Disable catalog preset options in drawer
Merge pull request #1343 from pjrobertson/resolvesProxy

Add a 'resolvesProxy' bool for actions that shouldn't resolve proxies. Fixes #1342