Restored return_bookmark functionality to Users
Merge branch '1.8.1' of github.com:/AppStateESS/phpwebsite into 1.8.1