Fixing the unmappable character for encoding utf-8 error
Merge branch 'master' of https://github.com/idega/com.idega.builder into BRANCH_PLATFORM_5

Conflicts:
	src/java/com/idega/builder/presentation/PopupWindowChooserWindow.java