Friends and friends requests were added.
Merge branch 'master' of https://github.com/kverchi/fixMe

Conflicts:
	src/main/java/com/kverchi/controller/SightController.java
	src/main/java/com/kverchi/controller/UserController.java