Merge branch 'develop' of cvs2:web/PetoskeyRobotics into develop

Conflicts:
	wp-config.php

diff --cc wp-config.php
index e4f8dd2,76e9f41..3e3da6d
--- 1/wp-config.php
--- 2/wp-config.php
+++ b/wp-config.php
@@@ -14,10 -14,10 +14,11 @@@
   * @package WordPress
   */
  define('WP_SITEURL', 'http://' . $_SERVER['SERVER_NAME'] . '/www.petoskeyrobotics.org/wordpress');
 -define('WP_HOME', 'http://' . $_SERVER['SERVER_NAME'].'/www.petoskeyrobotics.org/index.php');
 +define('WP_HOME', 'http://' . $_SERVER['SERVER_NAME'].'/www.petoskeyrobotics.org');
  define('WP_CONTENT_DIR', $_SERVER['DOCUMENT_ROOT'] . '/www.petoskeyrobotics.org/wp-content');
  define('WP_CONTENT_URL', 'http://' . $_SERVER['SERVER_NAME'] . '/www.petoskeyrobotics.org/wp-content');
 +//define('HEADWAY_ALLOW_RESET', true);
+ define('FS_METHOD', 'direct');
  // ** MySQL settings - You can get this info from your web host ** //
  /** The name of the database for WordPress */
  define('DB_NAME', 'petoskeyrobotics');