stuff
Merge branch 'master' of https://github.com/psu-stewardship/scholarsphere
Merge branch 'master' of https://github.com/psu-stewardship/scholarsphere
Added trophy to dashboard refs #3511
fixed tests and remoted javascript alerts for testing refs #3511
Fixed the nil on no user error fixes #3520
added spec tests and trophies to dashboard, delete.  Need to display on profile page.  refs #3511
Added trophy to dashboard refs #3511
fixed tests and remoted javascript alerts for testing refs #3511
added spec tests and trophies to dashboard, delete.  Need to display on profile page.  refs #3511
profile page displays file titles fixes #3511
fixed toogle trophy and removed debugging refs #3511
Resolving branch conflicts
Added all users button fixes #3522
Added gift to list of files fixes #3505
Added spec test for Trophy, checked user edit rights fixes #3525
added swfobject and cleaned up clippy. refs #1413
Added the abilty to remove trophy designation on profile page refs #3525
Added mouse over label to toggle Trophy ON and OFF  fixes #3530
Adding fix for save_tries and spec fixes #3528