Classpath
Merge branch 'master' of https://github.com/kverchi/fixMe

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/kverchi/fixMe
Merge branch 'master' of https://github.com/kverchi/fixMe
Changes:
Display of people status in newFriendPage. (different labels for cases 'in requests' and 'in friends').
Strength indicator of password in signup.jsp was added.
Bug with extracting content from DB was fixed.
Merge branch 'master' of https://github.com/kverchi/fixMe

Conflicts:
	src/main/webapp/WEB-INF/jsp/signup.jsp
	src/main/webapp/css/style.css