Merge branch 'master' into eduard-final-1
Test Case: New Surfer
Test Case: Edit/Delete Surfer

Not working yet.
Merge branch 'eduard-final-1'