Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager

Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/DeviceAttachmentPoint.java
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

src/main/java/net/floodlightcontroller/core/module/FloodlightModuleContext.java

@@ -29,7 +29,7 @@ public class FloodlightModuleContext implements IFloodlightModuleContext {
 	/**
 	 * Adds a IFloodlightModule for this Context.
 	 * @param clazz the service class
-	 * @param module The IFloodlightModule to add to the registry
+	 * @param service The IFloodlightService to add to the registry
 	 */
 	public void addService(Class<? extends IFloodlightService> clazz, 
 	                       IFloodlightService service) {

src/main/java/net/floodlightcontroller/core/module/IFloodlightModule.java

@@ -41,7 +41,7 @@ public interface IFloodlightModule {
 	 * Get a list of Modules that this module depends on.  The module system
 	 * will ensure that each these dependencies is resolved before the 
 	 * subsequent calls to init().
-	 * @return The Collection of IFloodlightServices that this module depnds
+	 * @return The Collection of IFloodlightServices that this module depends
 	 *         on.
 	 */