Added tests for showing only confirmed makers
fixed merge conflict on users_controller
Merge branch 'show_makers'