fixed devise signup username issue
Merge branch 'devise_fix'