remove LDAP check from user.rb
remove devise_ldap_authenticatable
merging some changes