post service improved
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
improved
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
improved
post service improved
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
user service improved application service improved, admin client side
application finished
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
synchronized
synchronized
synchronized
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/community.jsp
	JNUSocialNetwork/WebContent/pages/js/circle.js
	JNUSocialNetwork/WebContent/pages/js/community.js
	JNUSocialNetwork/WebContent/pages/js/function.js
	JNUSocialNetwork/WebContent/pages/styles/custom.css