Merge branch 'master' of senju@git.sourceforge.jp:/gitroot/rabbit-bts/RabbitBTS

diff --cc src/jp/sourceforge/rabbitBTS/controllers/MembersController.java
Simple merge

diff --cc src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
index 6c97323,96aa2a1..60c09ed
--- 1/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
--- 2/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
+++ b/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
@@@ -118,10 -118,10 +118,10 @@@ public final class RegisterController e
  
                try {
                        // nickName重複チェック
-                       if (this.accountService.fetchAccountByNickName(account
+                       if (this.accountService.getAccountByNickName(account
                                        .getNickName()) != null) {
                                result.rejectValue("nickName", "Account.nickName[duplicate]");
 -                              Sht.log(this).finer("nickName重複チェックエラー");
 +                              Sht.log(this).trace("nickName重複チェックエラー");
                                return null;
                        }
  

diff --cc src/jp/sourceforge/rabbitBTS/services/AccountService.java
Simple merge