Bug fix
Merge branch 'master' of github.com:idega/is.idega.idegaweb.egov.fsk

Conflicts:
	src/java/is/idega/idegaweb/egov/fsk/business/FSKBusinessBean.java