=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/SmsConsumerService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/SmsConsumerService.java	2016-03-08 14:53:40 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/SmsConsumerService.java	2016-03-08 16:48:15 +0000
@@ -29,6 +29,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * Zubair <rajazubair.asghar@gmail.com>
+ */
 
 public interface SmsConsumerService
 {

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java	2016-03-08 14:53:40 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java	2016-03-08 16:48:15 +0000
@@ -30,8 +30,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.TaskScheduler;
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/incoming/DefaultSmsConsumerService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/incoming/DefaultSmsConsumerService.java	2016-03-08 15:49:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/incoming/DefaultSmsConsumerService.java	2016-03-08 16:48:15 +0000
@@ -30,13 +30,16 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.hisp.dhis.setting.SettingKey;
 import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.sms.SmsPublisher;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 
+
 public class DefaultSmsConsumerService
     implements ApplicationListener<ContextRefreshedEvent>, SmsConsumerService
 {

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsController.java	2016-03-07 16:25:54 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsController.java	2016-03-08 16:48:15 +0000
@@ -99,7 +99,7 @@
         }
         else
         {
-            throw new WebMessageException( WebMessageUtils.error( "Message seding failed" ) );
+            throw new WebMessageException( WebMessageUtils.error( "Message sending failed" ) );
         }
     }
 
@@ -128,7 +128,7 @@
             }
             else
             {
-                throw new WebMessageException( WebMessageUtils.error( "Message seding failed" ) );
+                throw new WebMessageException( WebMessageUtils.error( "Message sending failed" ) );
             }
 
         }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsGatewayController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsGatewayController.java	2016-02-01 07:36:06 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsGatewayController.java	2016-03-08 16:48:15 +0000
@@ -56,6 +56,7 @@
 /**
  * Zubair <rajazubair.asghar@gmail.com>
  */
+
 @RestController
 @RequestMapping( value = "/sms/gateways" )
 public class SmsGatewayController