f
Merge remote-tracking branch 'origin/master'

Conflicts:
	NamooClubThreeService/src/com/namoo/ns1/service/facade/ClubService.java
	NamooClubThreeService/src/com/namoo/ns1/service/logic/ClubServiceLogic.java