pry removed
Merge branch 'master' of github.com:yurakuzh/mafia
database yaml remove ,params per page 5
Merge branch 'master' of github.com:yurakuzh/mafia
fixed conflict
Merge branch 'master' of github.com:yurakuzh/mafia
 role images
fixed conflicts