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

Conflicts:
	Social_Library/Social_Library-war/src/java/com/sociallibrary/library/AddLibrary.java
Merge branch 'master' of github.com:Faustyachka/nc_social_library_1
123