Merge branch 'master' of
https://github.com/namoo72thProject/namooclub.git

Conflicts:
	NamooClubThreeDomain/src/dom/entity/Club.java
	NamooClubThreeDomain/src/dom/entity/ClubManager.java
	NamooClubThreeDomain/src/dom/entity/ClubMember.java
	NamooClubThreeDomain/src/dom/entity/Membership.java
	NamooClubThreeService/src/com/namoo/ns1/service/facade/ClubService.java
	NamooClubThreeWeb/WebContent/WEB-INF/views/layout/menu.jsp
	NamooClubThreeWeb/WebContent/WEB-INF/views/management/aside_menu.jsp
	NamooClubThreeWeb/WebContent/WEB-INF/views/management/club.jsp
	NamooClubThreeWeb/WebContent/WEB-INF/views/management/member.jsp
Merge branch 'master' of
https://github.com/namoo72thProject/namooclub.git