Fix compile error in SmsController.java.
Merge branch 'dev'