Merge branch '2.0.18' of github.com:vanillaforums/Garden into 2.0.18

licts:

	applications/vanilla/models/class.categorymodel.php

index.php

@@ -1,6 +1,6 @@
 <?php
 define('APPLICATION', 'Vanilla');
-define('APPLICATION_VERSION', '2.0.18rc2');
+define('APPLICATION_VERSION', '2.0.18');
 /*
 Copyright 2008, 2009 Vanilla Forums Inc.
 This file is part of Garden.