idk
Merge branch 'Nate4' into Nate5

Conflicts:
431w/protected/controllers/ImmediateSaleController.php
431w/protected/runtime/application.log
431w/protected/views/site/index.php