Auto changes by Eclipse
Merge branch 'master' of github.com:idega/com.idega.block.media into BRANCH_PLATFORM_5

Conflicts:
	src/java/com/idega/block/media/business/MediaFileSystemBean.java