Fixing the unmappable character for encoding utf-8 error
Merge branch 'master' of git+ssh://github.com/idega/com.idega.user into BRANCH_PLATFORM_5

Conflicts:
	src/java/com/idega/user/presentation/SubsetSelector.java