Merge pull request #176 from amikheychik/master

Automatically disallow specialty shipping via UPS
Fix performance issue when loading catalog tree.
Merge pull request #177 from bendiy/master

Fix performance issue when loading catalog tree.
Override default classes with our own