Removed two extra lines
Merged conflict in ability.rb
Solved merge conflict
Changes in the labels of some buttons
Merged into remote branch
Resized small RD logo and added new default avatar placeholder