reg
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/Login.jsp
	JNUSocialNetwork/WebContent/pages/regAndLogin.jsp
commit
bell
custom.css
commit
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/js/initialization.js
	JNUSocialNetwork/WebContent/pages/parts/navRightProfile.jsp
	JNUSocialNetwork/src/system/SystemTestListener.java
commit
commit
recommend
commit
commit
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/people.jsp
	JNUSocialNetwork/WebContent/pages/styles/custom.css
commit