refactored
Merge branch 'master' of https://github.com/Faustyachka/nc_social_library

Conflicts:
	Social_Library/Social_Library-war/src/java/com/sociallibrary/registration/Registration.java

refactored