pull
Merge branch 'master' of github.com:Faustyachka/nc_social_library_1

Conflicts:
	Social_Library/Social_Library-war/src/java/com/sociallibrary/controller/RequestHandler.java
	Social_Library/Social_Library-war/web/globallib.jsp
	Social_Library/Social_Library-war/web/index.jsp
	Social_Library/Social_Library-war/web/locallib.jsp
	Social_Library/Social_Library-war/web/search.jsp
Admin page added