Merge remote-tracking branch 'origin/developerH' into developerH

# Conflicts:
#	src/main/webapp/static/modules/cmClubPortrait/cmClubPortrait.js