teplate jsp for role and changing in controller
Merge remote-tracking branch 'remotes/origin/master' into SocialReg

Conflicts:
	Social_Library/Social_Library-war/src/java/com/sociallibrary/controller/ConfigurationManager.java
	Social_Library/Social_Library-war/src/java/com/sociallibrary/controller/RequestHandler.java
	Social_Library/Social_Library-war/web/Registration.jsp
	Social_Library/Social_Library-war/web/index.jsp