Fixes for rebasing.

Change-Id: I765d2f2fc044fb30caef3cda8ff6bd03fef6b4e0

wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/AnalogChannel.java

@@ -98,7 +98,7 @@ public class AnalogChannel extends SensorBase implements PIDSource,
 		return m_moduleNumber;
 	}
 
-	/*
+    /**
 	 * Get the average value for use with PIDController
 	 *
 	 * @return the average value
@@ -107,7 +107,7 @@ public class AnalogChannel extends SensorBase implements PIDSource,
 		return getAverageVoltage();
 	}
 
-	/*
+    /**
 	 * Live Window code, only does anything if live window is activated.
 	 */
 	public String getSmartDashboardType() {

wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/SensorBase.java

@@ -12,12 +12,13 @@ package edu.wpi.first.wpilibj;
  * Stores most recent status information as well as containing utility functions for checking
  * channels and error processing.
  *
+ * 
  * XXX: Wait, there's no exception thrown if we try to allocate a non-existent module?  It that behavior correct?
  */
 public abstract class SensorBase { // TODO: Refactor
 
 	// TODO: Move this to the HAL
-
+  
     /**
      * Ticks per microsecond
      */