I don't know why I"m commiting again, just double checking the last commit.
Merge remote-tracking branch 'upstream/master'
uncommented rps
Merge remote-tracking branch 'upstream/master'
Fixed null-user problem with view_wishes
Minor change to auth - exposing isAuthenticated