Merge branch 'master' into eduard-4
Implemented Favorite function.

Need to test cascading deletes of User/Surfer.
Merge branch 'eduard-4'