some fixes
Merge branch 'BRANCH_PLATFORM_3_1' of github.com:idega/is.idega.idegaweb.member into BRANCH_PLATFORM_3_1

Conflicts:
	src/java/is/idega/idegaweb/member/presentation/UserGroupImageTab.java