smtp settings + log issue
Merge branch 'master' into production
rails_Admin removed from assets.rb