Changes in session entity
Merge branch 'master' into nehas

Conflicts:
	build/classes/entity/CommitteeMember.class
	ejbModule/entity/CommitteeMember.java