Fixed ability.rb and minticles/new.html.erb
Fix merge