Merge "User" and "User (with overlays)" roles into one, named "User"

Judging from the MINERVA use and for the sake of simplifying the model, the two roles "User" and "User (with overlays)" should be merged into one, named "User". All registered users will have the right to upload overlays.